From 26d0ae6aeb7efb3403cf85cb2b093b70fec63f99 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Sat, 19 Nov 2022 13:03:30 +0000
Subject: [PATCH] Update dotfiles/.local/bin/install-dotfiles,
 dotfiles/.local/aliases Deleted dotfiles/.local/bin/update-taskfiles

---
 dotfiles/.local/aliases              | 2 +-
 dotfiles/.local/bin/install-dotfiles | 5 ++++-
 dotfiles/.local/bin/update-taskfiles | 9 ---------
 3 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 dotfiles/.local/bin/update-taskfiles

diff --git a/dotfiles/.local/aliases b/dotfiles/.local/aliases
index 17ff7d2f..97b2f279 100644
--- a/dotfiles/.local/aliases
+++ b/dotfiles/.local/aliases
@@ -70,7 +70,7 @@ alias rclonegui='rclone rcd --rc-web-gui --rc-user=admin --rc-pass=pass --rc-ser
 alias reboot='sudo /sbin/reboot'
 
 # Local Task alias
-alias run="task --taskfile $HOME/.local/Taskfile.yml"
+alias run="task --taskfile $HOME/.local/shared-common/Taskfile.yml"
 
 # Make rm command verbose
 alias rm='rm -vi'
diff --git a/dotfiles/.local/bin/install-dotfiles b/dotfiles/.local/bin/install-dotfiles
index 3e4c2768..6b90f42f 100644
--- a/dotfiles/.local/bin/install-dotfiles
+++ b/dotfiles/.local/bin/install-dotfiles
@@ -3,7 +3,7 @@
 if [ -f '/etc/qubes-release' ]; then
   # Qubes dom0
   qvm-create --label red --template debian-11 provision &> /dev/null || EXIT_CODE=$?
-  qvm-run --pass-io provision 'if [ -d ~/Downloads/professor-dotfiles ]; then cd ~/Downloads/professor-dotfiles && git config pull.rebase false && rm -rf dotfiles/.local/asdf && git pull origin master && git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2; else git clone https://gitlab.com/megabyte-labs/dotfiles.git ~/Downloads/professor-dotfiles; cd ~/Downloads/professor-dotfiles/dotfiles/.local && git clone https://github.com/asdf-vm/asdf.git asdf --branch v0.10.2; fi; cd ~/Downloads; tar -zcvf /tmp/professor-dotfiles.tar.gz professor-dotfiles'
+  qvm-run --pass-io provision 'if [ -d ~/Downloads/professor-dotfiles ]; then cd ~/Downloads/professor-dotfiles && git config pull.rebase false && rm -rf dotfiles/.local/asdf && rm -rf dotfiles/.local/shared-common && git pull origin master && git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2 && git clone https://gitlab.com/megabyte-labs/common/shared.git dotfiles/.local/shared-common; else git clone https://gitlab.com/megabyte-labs/dotfiles.git ~/Downloads/professor-dotfiles; cd ~/Downloads/professor-dotfiles/dotfiles/.local && git clone https://github.com/asdf-vm/asdf.git asdf --branch v0.10.2 && git clone https://gitlab.com/megabyte-labs/common/shared.git shared-common; fi; cd ~/Downloads; tar -zcvf /tmp/professor-dotfiles.tar.gz professor-dotfiles'
   qvm-run --pass-io provision "cat /tmp/professor-dotfiles.tar.gz" > "/tmp/dotfiles.tar.gz"
   tar -xzf "/tmp/dotfiles.tar.gz" -C "$HOME"
   rm -f "/tmp/dotfiles.tar.gz"
@@ -17,14 +17,17 @@ else
     cd /usr/local/src/professor-dotfiles
     ${SUDO_PREFIX} git config pull.rebase false
     ${SUDO_PREFIX} rm -rf dotfiles/.local/asdf
+    ${SUDO_PREFIX} rm -rf dotfiles/.local/shared-common
     ${SUDO_PREFIX} git pull origin master
     ${SUDO_PREFIX} git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2
+    ${SUDO_PREFIX} git clone https://gitlab.com/megabyte-labs/common/shared.git dotfiles/.local/shared-common
     ${SUDO_PREFIX} chown -Rf "$USER":"$(id -g -n)" /usr/local/src/professor-dotfiles
     cd ~/
   else
     ${SUDO_PREFIX} rm -rf /usr/local/src/professor-dotfiles
     ${SUDO_PREFIX} git clone https://gitlab.com/megabyte-labs/dotfiles.git /usr/local/src/professor-dotfiles
     ${SUDO_PREFIX} git clone https://github.com/asdf-vm/asdf.git /usr/local/src/professor-dotfiles/dotfiles/.local/asdf --branch v0.10.2
+    ${SUDO_PREFIX} git clone https://gitlab.com/megabyte-labs/common/shared.git /usr/local/src/professor-dotfiles/dotfiles/.local/shared-common
     ${SUDO_PREFIX} chown -Rf "$USER":"$(id -g -n)" /usr/local/src/professor-dotfiles
   fi
   if [ -n "$CREATE_PACKAGE" ]; then
diff --git a/dotfiles/.local/bin/update-taskfiles b/dotfiles/.local/bin/update-taskfiles
deleted file mode 100644
index 635f34e8..00000000
--- a/dotfiles/.local/bin/update-taskfiles
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-curl -sSL https://gitlab.com/megabyte-labs/common/shared/-/archive/master/shared-master.tar.gz > shared-master.tar.gz
-tar -xzf shared-master.tar.gz > /dev/null
-rm shared-master.tar.gz
-rm -rf "$HOME/.local/taskfiles"
-mv shared-master/common/.config/taskfiles "$HOME/.local/taskfiles"
-mv shared-master/Taskfile.yml "$HOME/.local/Taskfile.yml"
-rm -rf shared-master