Update dialog boxes (add '\n' and fix typos)
This commit is contained in:
parent
b2978df02e
commit
7ae99c5740
|
|
@ -48,46 +48,46 @@ checkParameters() {
|
|||
}
|
||||
|
||||
getGitconfigData() {
|
||||
displayDialogBox --yesno "Would you like to set up gitconfig?" || return
|
||||
displayDialogBox --yesno "\nWould you like to set up gitconfig?" || return
|
||||
|
||||
displayDialogBox --msgbox "Now, I will ask you for data to set up gitconfig personal account."
|
||||
gitPersonalName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
displayDialogBox --msgbox "\nNow, I will ask you for data to set up gitconfig personal account."
|
||||
gitPersonalName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter a name." && return
|
||||
gitPersonalMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
gitPersonalMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter an e-mail." && return
|
||||
|
||||
while true; do
|
||||
displayDialogBox --yesno "Please confirm that the data you entered is correct:\n\n - Name: ${gitPersonalName}\n - E-mail: ${gitPersonalMail}" && break
|
||||
gitPersonalName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
displayDialogBox --yesno "\nPlease confirm that the data you entered is correct:\n\n - Name: ${gitPersonalName}\n - E-mail: ${gitPersonalMail}" && break
|
||||
gitPersonalName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter a name." && return
|
||||
gitPersonalMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
gitPersonalMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter an e-mail." && return
|
||||
done
|
||||
|
||||
displayDialogBox --yesno "Would you like to set up a work account?"
|
||||
displayDialogBox --yesno "\nWould you like to set up a work account?"
|
||||
if [ $? -eq 1 ]; then
|
||||
sed -e "s/PERSONAL_NAME/$gitPersonalName/g" -e "s/PERSONAL_MAIL/$gitPersonalMail/g" ./templates/.gitconfig-notwork > ./dotfiles/.gitconfig
|
||||
return
|
||||
fi
|
||||
|
||||
gitWorkPath=$(displayDialogBox --inputbox "Enter an absolute folder path where you would like to use the work account." VALUES 3>&1 1>&2 2>&3)
|
||||
gitWorkPath=$(displayDialogBox --inputbox "\nEnter an absolute folder path where you would like to use the work account." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter a path." && return
|
||||
mkdir -p "$gitWorkPath"
|
||||
while [[ ! -d $gitWorkPath ]]; do
|
||||
gitWorkPath=$(displayDialogBox --inputbox "Path isn't valid. Please try again" VALUES 3>&1 1>&2 2>&3)
|
||||
gitWorkPath=$(displayDialogBox --inputbox "\nPath isn't valid. Please try again." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter a path." && return
|
||||
mkdir -p "$gitWorkPath"
|
||||
done
|
||||
gitWorkName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
gitWorkName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter a name." && return
|
||||
gitWorkMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
gitWorkMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter an e-mail." && return
|
||||
|
||||
while true; do
|
||||
displayDialogBox --yesno "Please confirm that the data you entered is correct:\n\n - Name: ${gitWorkName}\n - E-mail: ${gitWorkMail}" && break
|
||||
gitWorkName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
displayDialogBox --yesno "\nPlease confirm that the data you entered is correct:\n\n - Name: ${gitWorkName}\n - E-mail: ${gitWorkMail}" && break
|
||||
gitWorkName=$(displayDialogBox --inputbox "\nEnter a name." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter a name." && return
|
||||
gitWorkMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
gitWorkMail=$(displayDialogBox --inputbox "\nEnter an e-mail." VALUES 3>&1 1>&2 2>&3)
|
||||
checkCancel "You must enter an e-mail." && return
|
||||
done
|
||||
|
||||
|
|
@ -130,11 +130,11 @@ runUserScripts() {
|
|||
}
|
||||
|
||||
startRice() {
|
||||
displayDialogBox --title "sadedot" --msgbox "Hi! This script will auto install my dotfiles."
|
||||
displayDialogBox --title "sadedot" --yesno "\nThis script will configure gitconfig, install the dotfiles, and then run the scripts of the '$(basename $PWD)/scripts' folder. Would you like to continue?"
|
||||
getGitconfigData
|
||||
source scripts/linkFiles.sh
|
||||
runUserScripts
|
||||
displayDialogBox --title "sadedot" --msgbox "All done! Enjoy..."
|
||||
displayDialogBox --title "sadedot" --msgbox "\nAll done! Enjoy..."
|
||||
}
|
||||
|
||||
runScript() {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ linkFile() {
|
|||
mv "$2" "${2}.backup"
|
||||
ln -s "$1" "$2"
|
||||
else
|
||||
selectedOption=$(displayDialogBox --menu "File already exists: $(basename "$1"), what would you like to do?" VALUES 0 1 "Skip" 2 "Skip all" 3 "Overwrite" 4 "Overwrite all" 5 "Backup" 6 "Backup all" 3>&1 1>&2 2>&3)
|
||||
selectedOption=$(displayDialogBox --menu "\nFile already exists: $(basename "$1"), what would you like to do?" VALUES 0 1 "Skip" 2 "Skip all" 3 "Overwrite" 4 "Overwrite all" 5 "Backup" 6 "Backup all" 3>&1 1>&2 2>&3)
|
||||
if [ $? -eq 1 ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
|
@ -81,10 +81,10 @@ loopThroughFiles() {
|
|||
item=$(echo "$item" | awk '{ sub(/.*dotfiles\/other\//, ""); print }')
|
||||
files="${files}$item\n"
|
||||
done < <(find -H "$DOTFILES/other" -mindepth 1 -type f -print0)
|
||||
displayDialogBox --yesno "There are 'other' files, would you like to install them?\n\n${files}" || return
|
||||
displayDialogBox --yesno "\nThere are 'other' files, would you like to install them?\n\n${files}" || return
|
||||
fi
|
||||
|
||||
password=$(displayDialogBox --passwordbox "Enter your password" VALUES 3>&1 1>&2 2>&3)
|
||||
password=$(displayDialogBox --passwordbox "\nEnter your password." VALUES 3>&1 1>&2 2>&3)
|
||||
echo "$password" | sudo -S bash -c "" > /dev/null 2>&1
|
||||
echo "$password" | sudo -S bash -c "$(declare -f runDetachedScript); $(declare -f linkFile); runDetachedScript getDialogBox"
|
||||
unset password
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
parentName="$(basename $PWD)"
|
||||
echo $parentName
|
||||
exit
|
||||
Loading…
Reference in New Issue