slococo
/
sadedot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bugs

This commit is contained in:
Santiago Lo Coco 2021-12-30 23:40:32 -03:00
parent 2a320b9101
commit 029392e0a6
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/bootstrap.sh
View File

@ -51,8 +51,7 @@ getGitconfigData() {
gitPersonalMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3) gitPersonalMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
while true; do while true; do
displayDialogBox --yesno "Please confirm that the data you entered is correct:\n\n - Name: ${gitPersonalName}\n - E-mail: ${gitPersonalMail}" displayDialogBox --yesno "Please confirm that the data you entered is correct:\n\n - Name: ${gitPersonalName}\n - E-mail: ${gitPersonalMail}" && break
[ $? -eq 1 ] || break
gitPersonalName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3) gitPersonalName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
gitPersonalMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3) gitPersonalMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
done done
@ -65,15 +64,13 @@ getGitconfigData() {
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 "Enter an absolute folder path where you would like to use the work account." VALUES 3>&1 1>&2 2>&3)
while [[ ! -d $gitWorkPath ]]; do while [[ ! -d $gitWorkPath ]]; do
[ $? -eq 1 ] || break
gitWorkPath=$(displayDialogBox --inputbox "Path isn't valid. Please try again" VALUES 3>&1 1>&2 2>&3) gitWorkPath=$(displayDialogBox --inputbox "Path isn't valid. Please try again" VALUES 3>&1 1>&2 2>&3)
done done
gitWorkName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3) gitWorkName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
gitWorkMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3) gitWorkMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
while true; do while true; do
displayDialogBox --yesno "Please confirm that the data you entered is correct:\n\n - Name: ${gitWorkName}\n - E-mail: ${gitWorkMail}" displayDialogBox --yesno "Please confirm that the data you entered is correct:\n\n - Name: ${gitWorkName}\n - E-mail: ${gitWorkMail}" && break
[ $? -eq 1 ] || break
gitWorkName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3) gitWorkName=$(displayDialogBox --inputbox "Enter a name." VALUES 3>&1 1>&2 2>&3)
gitWorkMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3) gitWorkMail=$(displayDialogBox --inputbox "Enter an e-mail." VALUES 3>&1 1>&2 2>&3)
done done
@ -110,9 +107,9 @@ checkForDependencies() {
startRice() { startRice() {
displayDialogBox --title "CocoRice" --msgbox "Hi! This script will auto install my dotfiles." displayDialogBox --title "CocoRice" --msgbox "Hi! This script will auto install my dotfiles."
getGitconfigData getGitconfigData
sh scripts/linkFiles.sh # sh scripts/linkFiles.sh
sh scripts/install.sh # sh scripts/install.sh
displayDialogBox --title "CocoRice" --msgbox "All done! Enjoy..." # displayDialogBox --title "CocoRice" --msgbox "All done! Enjoy..."
} }
runScript() { runScript() {
@ -126,7 +123,7 @@ runScript() {
startRice startRice
clear # clear
cd $lastFolder cd $lastFolder
} }

9
scripts/linkFiles.sh
View File

@ -82,22 +82,21 @@ loopThroughFiles() {
if [ -d "$DOTFILES_OTHER" ]; then if [ -d "$DOTFILES_OTHER" ]; then
filesOutput=$(find -H "$DOTFILES_OTHER" | sed -n 2~1p | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }') filesOutput=$(find -H "$DOTFILES_OTHER" | sed -n 2~1p | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }')
displayDialogBox --yesno "There are 'other' files, would you like to install them?\n\n$filesOutput" displayDialogBox --yesno "There are 'other' files, would you like to install them?\n\n$filesOutput" || return
[ $? -eq 1 ] || return
fi fi
for srcFile in $(find -H "$DOTFILES_OTHER"); do for srcFile in $(find -H "$DOTFILES_OTHER"); do
if [[ -d "$srcFile" ]]; then if [[ -d "$srcFile" ]]; then
var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }') var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }')
if [[ ! -d "$HOME/$var" ]]; then if [[ ! -d "/$var" ]]; then
sudo mkdir -p "$var" sudo mkdir -p "/$var"
fi fi
fi fi
if [[ -f "$srcFile" ]]; then if [[ -f "$srcFile" ]]; then
var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }') var=$(echo "$srcFile" | awk '{ sub(/.*CocoRice\/dotfiles\/other\//, ""); print }')
sudo linkFile "$srcFile" "$var" sudo linkFile "$srcFile" "/$var"
fi fi
done done
} }