From 5cc8dab7b44193922dda34cae24cb2cac74e65a9 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Sat, 19 Nov 2022 13:33:28 +0000
Subject: [PATCH] Update dotfiles/.local/aliases,
 dotfiles/.local/bin/install-dotfiles

---
 dotfiles/.local/aliases              |  2 +-
 dotfiles/.local/bin/install-dotfiles | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dotfiles/.local/aliases b/dotfiles/.local/aliases
index 97b2f279..e913e8a9 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/shared-common/Taskfile.yml"
+alias run="task --taskfile $HOME/.local/common/shared/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 e8ea8db2..3ab19e7b 100644
--- a/dotfiles/.local/bin/install-dotfiles
+++ b/dotfiles/.local/bin/install-dotfiles
@@ -10,7 +10,7 @@ if [ -f '/etc/qubes-release' ]; then
   logg info 'Ensuring provision VM is present'
   qvm-create --label red --template debian-11 provision &> /dev/null || EXIT_CODE=$?
   logg info 'Downloading dotfile assets with provision VM'
-  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 'if [ -d ~/Downloads/professor-dotfiles ]; then cd ~/Downloads/professor-dotfiles && git config pull.rebase false && rm -rf dotfiles/.local/asdf && rm -rf dotfiles/.local/common/shared && git pull origin master && git clone https://github.com/asdf-vm/asdf.git dotfiles/.local/asdf --branch v0.10.2 && mkdir -p dotfiles/.local/common/shared && git clone https://gitlab.com/megabyte-labs/common/shared.git dotfiles/.local/common/shared; 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 && mkdir common && git clone https://gitlab.com/megabyte-labs/common/shared.git common/shared; fi; cd ~/Downloads; tar -zcvf /tmp/professor-dotfiles.tar.gz professor-dotfiles'
   logg info 'Transferring dotfiles to dom0 from provision VM'
   qvm-run --pass-io provision "cat /tmp/professor-dotfiles.tar.gz" > "/tmp/dotfiles.tar.gz"
   logg info 'Unpacking dotfile assets to /usr/local/src/professor-dotfiles'
@@ -28,10 +28,10 @@ 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} rm -rf dotfiles/.local/common/shared
     ${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} git clone https://gitlab.com/megabyte-labs/common/shared.git dotfiles/.local/common/shared
     ${SUDO_PREFIX} chown -Rf "$USER":"$(id -g -n)" /usr/local/src/professor-dotfiles
     cd ~/
   else
@@ -39,7 +39,8 @@ 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} mkdir -p /usr/local/src/professor-dotfiles/dotfiles/.local/common/shared
+    ${SUDO_PREFIX} git clone https://gitlab.com/megabyte-labs/common/shared.git /usr/local/src/professor-dotfiles/dotfiles/.local/common/shared
     ${SUDO_PREFIX} chown -Rf "$USER":"$(id -g -n)" /usr/local/src/professor-dotfiles
   fi
   if [ -n "$CREATE_PACKAGE" ]; then
@@ -50,7 +51,7 @@ else
   fi
 fi
 
-logg info 'Copying dotfiles'
+logg info 'Copying dotfiles to user $HOME directory'
 
 # Copy dotfile folders
 while read DOTFILE_FOLDER; do