Alexander/LARBS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shellcheck

Browse Source
This commit is contained in:
Luke Smith 2018-12-11 16:19:30 -05:00
parent 20a1143b75
commit 94d889d5b0
No known key found for this signature in database
GPG Key ID: 4C50B54A911F6252
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
larbs.sh
View File

@ -55,14 +55,14 @@ getuserandpass() { \
done done
pass1=$(dialog --no-cancel --passwordbox "Enter a password for that user." 10 60 3>&1 1>&2 2>&3 3>&1) pass1=$(dialog --no-cancel --passwordbox "Enter a password for that user." 10 60 3>&1 1>&2 2>&3 3>&1)
pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1) pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1)
while ! [[ ${pass1} == ${pass2} ]]; do while ! [[ ${pass1} == "${pass2}" ]]; do
unset pass2 unset pass2
pass1=$(dialog --no-cancel --passwordbox "Passwords do not match.\\n\\nEnter password again." 10 60 3>&1 1>&2 2>&3 3>&1) pass1=$(dialog --no-cancel --passwordbox "Passwords do not match.\\n\\nEnter password again." 10 60 3>&1 1>&2 2>&3 3>&1)
pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1) pass2=$(dialog --no-cancel --passwordbox "Retype password." 10 60 3>&1 1>&2 2>&3 3>&1)
done ;} done ;}
usercheck() { \ usercheck() { \
! (id -u $name &>/dev/null) || ! (id -u "$name" &>/dev/null) ||
dialog --colors --title "WARNING!" --yes-label "CONTINUE" --no-label "No wait..." --yesno "The user \`$name\` already exists on this system. LARBS can install for a user already existing, but it will \\Zboverwrite\\Zn any conflicting settings/dotfiles on the user account.\\n\\nLARBS will \\Zbnot\\Zn overwrite your user files, documents, videos, etc., so don't worry about that, but only click <CONTINUE> if you don't mind your settings being overwritten.\\n\\nNote also that LARBS will change $name's password to the one you just gave." 14 70 dialog --colors --title "WARNING!" --yes-label "CONTINUE" --no-label "No wait..." --yesno "The user \`$name\` already exists on this system. LARBS can install for a user already existing, but it will \\Zboverwrite\\Zn any conflicting settings/dotfiles on the user account.\\n\\nLARBS will \\Zbnot\\Zn overwrite your user files, documents, videos, etc., so don't worry about that, but only click <CONTINUE> if you don't mind your settings being overwritten.\\n\\nNote also that LARBS will change $name's password to the one you just gave." 14 70
} }
@ -76,12 +76,12 @@ adduserandpass() { \
gitmakeinstall() { gitmakeinstall() {
dir=$(mktemp -d) dir=$(mktemp -d)
dialog --title "LARBS Installation" --infobox "Installing \`$(basename $1)\` ($n of $total) via \`git\` and \`make\`. $(basename $1) $2" 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$(basename "$1")\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 5 70
git clone --depth 1 "$1" "$dir" &>/dev/null git clone --depth 1 "$1" "$dir" &>/dev/null
cd "$dir" || exit cd "$dir" || exit
make &>/dev/null make &>/dev/null
make install &>/dev/null make install &>/dev/null
cd /tmp ;} cd /tmp || return ;}
maininstall() { # Installs all needed programs from main repo. maininstall() { # Installs all needed programs from main repo.
dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 5 70
@ -91,7 +91,7 @@ maininstall() { # Installs all needed programs from main repo.
aurinstall() { \ aurinstall() { \
dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 5 70
grep "^$1$" <<< "$aurinstalled" && return grep "^$1$" <<< "$aurinstalled" && return
sudo -u $name $aurhelper -S --noconfirm "$1" &>/dev/null sudo -u "$name" $aurhelper -S --noconfirm "$1" &>/dev/null
} }
installationloop() { \ installationloop() { \
@ -137,17 +137,17 @@ resetpulse() { dialog --infobox "Reseting Pulseaudio..." 4 50
manualinstall() { # Installs $1 manually if not installed. Used only for AUR helper here. manualinstall() { # Installs $1 manually if not installed. Used only for AUR helper here.
[[ -f /usr/bin/$1 ]] || ( [[ -f /usr/bin/$1 ]] || (
dialog --infobox "Installing \"$1\", an AUR helper..." 4 50 dialog --infobox "Installing \"$1\", an AUR helper..." 4 50
cd /tmp cd /tmp || exit
rm -rf /tmp/"$1"* rm -rf /tmp/"$1"*
curl -sO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz && curl -sO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz &&
sudo -u "$name" tar -xvf "$1".tar.gz &>/dev/null && sudo -u "$name" tar -xvf "$1".tar.gz &>/dev/null &&
cd "$1" && cd "$1" &&
sudo -u $name makepkg --noconfirm -si &>/dev/null sudo -u "$name" makepkg --noconfirm -si &>/dev/null
cd /tmp) ;} cd /tmp || return) ;}
finalize(){ \ finalize(){ \
dialog --infobox "Preparing welcome message..." 4 50 dialog --infobox "Preparing welcome message..." 4 50
echo "exec_always --no-startup-id notify-send -i ~/.scripts/pix/larbs.png '<b>Welcome to LARBS:</b> Press Super+F1 for the manual.' -t 10000" >> /home/$name/.config/i3/config echo "exec_always --no-startup-id notify-send -i ~/.scripts/pix/larbs.png '<b>Welcome to LARBS:</b> Press Super+F1 for the manual.' -t 10000" >> "/home/$name/.config/i3/config"
dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment.\\n\\n-Luke" 12 80 dialog --title "All done!" --msgbox "Congrats! Provided there were no hidden errors, the script completed successfully and all the programs and configuration files should be in place.\\n\\nTo run the new graphical environment, log out and log back in as your new user, then run the command \"startx\" to start the graphical environment.\\n\\n-Luke" 12 80
} }