Break deployment script into two separate scripts - run intended to run as root and the other as the standard user

2 files changed, 53 insertions, 41 deletions

diff --git a/install.sh b/init.sh
index 03d93ad..cf69dea 100755
--- a/install.sh
+++ b/init.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Script 1 - run this as root after installation
+
 # source configuration file
 source deploy.conf
 
@@ -43,45 +45,7 @@ ufw reload
 user=$(cat /etc/passwd | grep 1000 | cut -d ':' -f 1)
 usermod -aG sudo $user
 
-# Switch to standard user and disable root password
-su $user
-passwd -l root
-
-# Get and deploy dotfiles
-echo "backing up current home directory to ~/home_backup"
-rsync -av $HOME/ $HOME/home_backup/
-cd $HOME
-git clone https://git.chudnick.com/dotfiles
-rsync --exclude .git/ --exclude LICENSE -av $HOME/dotfiles/ $HOME
-chsh -s $(which zsh) $USER
-
-# DWM
-if [ ! -z $DWM ]; then
-        mkdir -p $HOME/.local/src/
-        cd $HOME/.local/src/
-        sudo apt install libx11-dev libx11-xcb-dev libxcb-res0-dev libxft-dev libxinerama-dev -y
-        git clone https://git.chudnick.com/dwm
-        cd dwm
-        sudo make install
-        cd $HOME
-fi
-
-# DWMBLOCKS
-if [ ! -z $DWMBLOCKS ]; then
-        mkdir -p $HOME/.local/src/
-        cd $HOME/.local/src/
-        sudo apt install libx11-dev -y
-        git clone https://git.chudnick.com/dwmblocks
-        cd dwmblocks
-        sudo make install
-        cd $HOME
-fi
-
-# SSH
-[ ! -z $CONFIG_SSH ] && ssh-keygen 
-
-# SSH SERVER
-[ ! -z $CONFIG_SSH_SERVER ] && sudo apt install openssh-server -y && sudo ufw allow ssh
+cp user.sh deploy.conf /home/$USER/
 
-# GPG
-[ ! -z $CONFIG_GPG ] && gpg --full-gen-key
+echo "Next: run 'logout' and then log in as the standard user created during the installation"
+echo "After loggin in run: './ user.sh'"
diff --git a/user.sh b/user.sh
new file mode 100755
index 0000000..3843b04
--- /dev/null
+++ b/user.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# Script 2 - run as standard user
+
+# source configuration file
+source deploy.conf
+
+# Disable root password
+passwd -l root
+
+# Get and deploy dotfiles
+echo "backing up current home directory to ~/home_backup"
+rsync -av $HOME/ $HOME/home_backup/
+cd $HOME
+git clone https://git.chudnick.com/dotfiles
+rsync --exclude .git/ --exclude LICENSE -av $HOME/dotfiles/ $HOME
+chsh -s $(which zsh) $USER
+
+# DWM
+if [ ! -z $DWM ]; then
+        mkdir -p $HOME/.local/src/
+        cd $HOME/.local/src/
+        sudo apt install libx11-dev libx11-xcb-dev libxcb-res0-dev libxft-dev libxinerama-dev -y
+        git clone https://git.chudnick.com/dwm
+        cd dwm
+        sudo make install
+        cd $HOME
+fi
+
+# DWMBLOCKS
+if [ ! -z $DWMBLOCKS ]; then
+        mkdir -p $HOME/.local/src/
+        cd $HOME/.local/src/
+        sudo apt install libx11-dev -y
+        git clone https://git.chudnick.com/dwmblocks
+        cd dwmblocks
+        sudo make install
+        cd $HOME
+fi
+
+# SSH
+[ ! -z $CONFIG_SSH ] && ssh-keygen 
+
+# SSH SERVER
+[ ! -z $CONFIG_SSH_SERVER ] && sudo apt install openssh-server -y && sudo ufw allow ssh
+
+# GPG
+[ ! -z $CONFIG_GPG ] && gpg --full-gen-key