NapoleonDynamite/LARBS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

no quit on conflict

Browse source
This commit is contained in:
Luke Smith 2019-01-09 00:51:13 -05:00
parent f35671eb34
commit 198a179792
No known key found for this signature in database
GPG key ID: 4C50B54A911F6252
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
larbs.sh
View file

@ -29,7 +29,7 @@ welcomemsg() { \
getuserandpass() { \ getuserandpass() { \
# Prompts user for new username an password. # Prompts user for new username an password.
name=$(dialog --inputbox "First, please enter a name for the user account." 10 60 3>&1 1>&2 2>&3 3>&1) || exit name=$(dialog --inputbox "First, please enter a name for the user account." 10 60 3>&1 1>&2 2>&3 3>&1) || exit
while ! echo "$name" | grep "^[a-z_][a-z0-9_-]*$"; do while ! echo "$name" | grep "^[a-z_][a-z0-9_-]*$" >/dev/null 2>&1; do
name=$(dialog --no-cancel --inputbox "Username not valid. Give a username beginning with a letter, with only lowercase letters, - or _." 10 60 3>&1 1>&2 2>&3 3>&1) name=$(dialog --no-cancel --inputbox "Username not valid. Give a username beginning with a letter, with only lowercase letters, - or _." 10 60 3>&1 1>&2 2>&3 3>&1)
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)
@ -105,9 +105,9 @@ installationloop() { \
n=$((n+1)) n=$((n+1))
echo "$comment" | grep "^\".*\"$" >/dev/null 2>&1 && comment="$(echo "$comment" | sed "s/\(^\"\|\"$\)//g")" echo "$comment" | grep "^\".*\"$" >/dev/null 2>&1 && comment="$(echo "$comment" | sed "s/\(^\"\|\"$\)//g")"
case "$tag" in case "$tag" in
"") maininstall "$program" "$comment" || error "Fatal error encountered while installing $program." ;; "") maininstall "$program" "$comment" ;;
"A") aurinstall "$program" "$comment" || error "Fatal error encountered while installing $program." ;; "A") aurinstall "$program" "$comment" ;;
"G") gitmakeinstall "$program" "$comment" || error "Fatal error encountered while installing $program." ;; "G") gitmakeinstall "$program" "$comment" ;;
esac esac
done < /tmp/progs.csv ;} done < /tmp/progs.csv ;}