From 8a253e10900f4044f53630b3d0bd39833cfc2f16 Mon Sep 17 00:00:00 2001
From: Alexandre CATTEAU <alexandre.catteau@gmail.com>
Date: Sat, 12 Mar 2022 12:24:28 +0100
Subject: [PATCH] install.sh: adapt behviour when calling with argument

---
 README.md  |  2 +-
 install.sh | 38 ++++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 669874b..e26b763 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,4 @@ This repository contains setup or config files for generic CLI applications, suc
 * `tmux.conf` is tmux config file and should be installed at `~/.tmux.conf`.
 #### Installation
 * `install.sh` script copies above files to their respective destinations;
-  * can be called with an argument, which will be used as user name.
+  * can be called with an argument, which will be used as user name (to be used with setup scripts).
diff --git a/install.sh b/install.sh
index 3de68bb..224b4ee 100644
--- a/install.sh
+++ b/install.sh
@@ -4,26 +4,32 @@ run_directory=$(dirname "$0")
 
 if [ -z "$1" ]; then
   user=$(whoami)
-else
-  user=$1
-fi
-
-if [[ $user != 'root' ]]; then
-  echo "Copying rcs to home directory..."
-  cp $run_directory/bashrc /home/$user/.bashrc
-  cp $run_directory/vimrc /home/$user/.vimrc
-  cp $run_directory/tmux.conf /home/$user/.tmux.conf
-
-  if ! command -v sudo &> /dev/null; then
-    echo "Could not copy to root directory: sudo was not found."
+  if [[ $user != 'root' ]]; then
+    echo "Copying rcs to home directory..."
+    cp $run_directory/bashrc /home/$user/.bashrc
+    cp $run_directory/vimrc /home/$user/.vimrc
+    cp $run_directory/tmux.conf /home/$user/.tmux.conf
+    if ! command -v sudo &> /dev/null; then
+      echo "Could not copy to root directory: sudo was not found."
+    else
+      echo "Copying rcs to root directory..."
+      sudo cp $run_directory/bashrc /root/.bashrc
+      sudo cp $run_directory/vimrc /root/.vimrc
+      sudo cp $run_directory/tmux.conf /root/.tmux.conf
+    fi
   else
     echo "Copying rcs to root directory..."
-    sudo cp $run_directory/bashrc /root/.bashrc
-    sudo cp $run_directory/vimrc /root/.vimrc
-    sudo cp $run_directory/tmux.conf /root/.tmux.conf
+    cp $run_directory/bashrc /root/.bashrc
+    cp $run_directory/vimrc /root/.vimrc
+    cp $run_directory/tmux.conf /root/.tmux.conf
   fi
 
-else
+else # running from a setup script, assuming as root
+  user=$1
+  echo "Copying rcs to home directory..."
+  sudo -H -u $user cp $run_directory/bashrc /home/$user/.bashrc
+  sudo -H -u $user cp $run_directory/vimrc /home/$user/.vimrc
+  sudo -H -u $user cp $run_directory/tmux.conf /home/$user/.tmux.conf
   echo "Copying rcs to root directory..."
   cp $run_directory/bashrc /root/.bashrc
   cp $run_directory/vimrc /root/.vimrc