Revert "install.sh: adapt behviour when calling with argument"

This reverts commit 8a253e1090.
This commit is contained in:
Alexandre CATTEAU 2022-03-12 12:37:24 +01:00
parent 8a253e1090
commit d8c16a134a
2 changed files with 17 additions and 23 deletions

View File

@ -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`. * `tmux.conf` is tmux config file and should be installed at `~/.tmux.conf`.
#### Installation #### Installation
* `install.sh` script copies above files to their respective destinations; * `install.sh` script copies above files to their respective destinations;
* can be called with an argument, which will be used as user name (to be used with setup scripts). * can be called with an argument, which will be used as user name.

View File

@ -4,11 +4,16 @@ run_directory=$(dirname "$0")
if [ -z "$1" ]; then if [ -z "$1" ]; then
user=$(whoami) user=$(whoami)
else
user=$1
fi
if [[ $user != 'root' ]]; then if [[ $user != 'root' ]]; then
echo "Copying rcs to home directory..." echo "Copying rcs to home directory..."
cp $run_directory/bashrc /home/$user/.bashrc cp $run_directory/bashrc /home/$user/.bashrc
cp $run_directory/vimrc /home/$user/.vimrc cp $run_directory/vimrc /home/$user/.vimrc
cp $run_directory/tmux.conf /home/$user/.tmux.conf cp $run_directory/tmux.conf /home/$user/.tmux.conf
if ! command -v sudo &> /dev/null; then if ! command -v sudo &> /dev/null; then
echo "Could not copy to root directory: sudo was not found." echo "Could not copy to root directory: sudo was not found."
else else
@ -17,19 +22,8 @@ if [ -z "$1" ]; then
sudo cp $run_directory/vimrc /root/.vimrc sudo cp $run_directory/vimrc /root/.vimrc
sudo cp $run_directory/tmux.conf /root/.tmux.conf sudo cp $run_directory/tmux.conf /root/.tmux.conf
fi fi
else
echo "Copying rcs to root directory..."
cp $run_directory/bashrc /root/.bashrc
cp $run_directory/vimrc /root/.vimrc
cp $run_directory/tmux.conf /root/.tmux.conf
fi
else # running from a setup script, assuming as root else
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..." echo "Copying rcs to root directory..."
cp $run_directory/bashrc /root/.bashrc cp $run_directory/bashrc /root/.bashrc
cp $run_directory/vimrc /root/.vimrc cp $run_directory/vimrc /root/.vimrc