xstefen/al-skel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue in upgrade script not setting up user home properly

Browse Source
This commit is contained in:
natemaia 2017-10-28 22:14:45 -07:00
parent f798d676a1
commit cf54edec73
1 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
upgrade-archlabs
View File

@ -14,8 +14,7 @@ KEYS=('AEFB411B072836CD48FF0381AE252C284B5DBA5D'
'9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0' '9E4F11C6A072942A7B3FD3B0B81EB14A09A25EB0'
'35F52A02854DCCAEC9DD5CC410443C7F54B00041') '35F52A02854DCCAEC9DD5CC410443C7F54B00041')
DIR="$HOME/.config" DIR="$HOME/.config"
SCRIPT_PATH="`dirname \"$0\"`" SCRIPT_PATH=$(pwd)
SCRIPT_PATH="`( cd \"$SCRIPT_PATH\" && pwd )`"
@ -44,7 +43,8 @@ setupKeyring() {
fi fi
# finish # finish
POPULATED=$(sudo pacman-key --populate archlabs) sudo pacman-key --populate archlabs
POPULATED="Done"
done done
@ -58,14 +58,12 @@ backupConfigs() {
unset BACKEDUP unset BACKEDUP
while ! [ $BACKEDUP ]; do while ! [ $BACKEDUP ]; do
cd "$HOME/Downloads/"
clear; echo "############################################################################################ clear; echo "############################################################################################
######## Backing up configs to /home/$USER/Downloads/$USER-config-backup.tar.gz ######### ######## Backing up configs to /home/$USER/Downloads/$USER-config-backup.tar.gz #########
############################################################################################" ############################################################################################"
# Do the archive # Do the archive
tar czvf $USER-config-backup.tar.gz $HOME/.{config,Xresources,zshrc,bashrc,icons,xsession,xsessionrc,xinitrc} > /dev/null 2>&1 tar czvf $HOME/Downloads/$USER-config-backup.tar.gz $HOME/.{config,Xresources,zshrc,bashrc,icons,xsession,xsessionrc,xinitrc} > /dev/null 2>&1
# set BACKEDUP for setupConfigs check # set BACKEDUP for setupConfigs check
BACKEDUP="Done" BACKEDUP="Done"
@ -79,29 +77,16 @@ backupConfigs() {
setupConfigs() { setupConfigs() {
# call backupConfigs before we continue # get rid of old leftover configs/scripts
backupConfigs rm -rf $HOME/.config/{bspwm,dunst,i3,obmenu-generator,qt5ct,Thunar,conky,geany,neofetch,polybar,termite,xfce4,openbox}
sudo rm -rf /etc/skel/*
if [[ $BACKEDUP == "Done" ]]; then clear; echo "############################################################################################
# get rid of old leftover configs/scripts
rm -rf $DIR/{bspwm,dunst,i3,obmenu-generator,qt5ct,Thunar,conky,geany,neofetch,polybar,termite,xfce4,openbox}
sudo rm -rf /etc/skel/*
clear; echo "############################################################################################
######## Setting up new configs ######### ######## Setting up new configs #########
############################################################################################" ############################################################################################"
# Copy configs to /etc/skel/ & $HOME # Copy configs to /etc/skel/ & $HOME
cd "$SCRIPT_PATH/" cp -rf "$PWD/home/"{bin,.config,.themes,.gorice,.Xresources,.Xresources.template,.mozilla,.zshrc,.bashrc,.icons,.local,.xsession,.xsessionrc,.xinitrc} "$HOME/"
cp -r home/* $HOME/ sudo cp -rf "$PWD/home/"{bin,.config,.themes,.gorice,.Xresources,.Xresources.template,.mozilla,.zshrc,.bashrc,.icons,.local,.xsession,.xsessionrc,.xinitrc} /etc/skel/
sudo cp -r home/* /etc/skel/ sudo cp -rf "$PWD/etc" /
sudo cp -r etc/* /etc/
else
echo "[WARNING]: Configs were not backed up... Exiting" # error out if no backup was made
exit 1
fi
} }
@ -109,10 +94,15 @@ setupConfigs() {
# first setupKeyring # first setupKeyring
setupKeyring setupKeyring
# then setupConfigs, it will call backupConfigs # call backupConfigs before we continue
backupConfigs
# then setupConfigs
setupConfigs setupConfigs
# finish up by setting and reloading everything
$HOME/.config/setup
$HOME/.config/polybar/scripts/launch-polybar --reload > /dev/null 2>&1
clear; echo "############################################################################################ clear; echo "############################################################################################
######## Setup Successfully Completed ######### ######## Setup Successfully Completed #########