diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index ac365ee..777ba12 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -128,7 +128,7 @@ runUserScripts() {
 startRice() {
     msg="\nThis script will configure gitconfig, install the dotfiles"
     if [[ -n $userScriptsFlag && $userScriptsFlag = true ]]; then
-        msg="${msg}, and then run the scripts of the '$(basename $PWD)/scripts' folder"
+        msg="${msg}, and then run the scripts of the '$(basename "$PWD")/scripts' folder"
     fi
     msg="${msg}. Would you like to continue?"
     displayDialogBox --title "sadedot" --yesno "$msg" || return
@@ -145,7 +145,9 @@ runScript() {
     sadedotFolder=$(pwd -P | awk '{ sub(/sadedot.*/, "sadedot"); print }')
     cd "$sadedotFolder" || { echo "Couldn't cd into '$sadedotFolder'." 1>&2 && exit 1; }
 
-    [[ "$(basename $sadedotFolder)" != "sadedot" ]] && cd sadedot
+    if [[ "$(basename "$sadedotFolder")" != "sadedot" ]]; then
+        cd sadedot || { echo "Couldn't cd into 'sadedot'." 1>&2 && exit 1; }
+    fi
 
     source scripts/common.sh
     checkParameters "$@"
diff --git a/scripts/common.sh b/scripts/common.sh
index 6ea58b7..8cbc8bc 100755
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -77,7 +77,7 @@ useWhiptail() {
     fi
     width=$(calcWidthWhiptail "$str")
     height=$(calcHeightWhiptail "$str")
-    [ $inputbox = true ] && [ $width -lt 30 ] && width=$((width+5))
+    [ $inputbox = true ] && [ "$width" -lt 30 ] && width=$((width+5))
     [ $infobox = true ] && height=$((height-1))
     formatOptions "$@"
     if [ "$found" = false ]; then
@@ -106,16 +106,16 @@ usePlainText() {
         esac
     done
     tput bold
-    printf "${2:2}\n"
+    printf '%s\n' "${2:2}"
     tput sgr0
     if [ $inputbox = true ]; then
         printLine && printf "\n"
         read -r readVar
-        printf "$readVar" 1>&2
+        printf '%s' "$readVar" 1>&2
     elif [ $passwordbox = true ]; then
         printLine && printf "\n"
         read -r -s readVar
-        printf "$readVar" 1>&2
+        printf '%s' "$readVar" 1>&2
     elif [ $yesno = true ]; then
         printLine
         printf '\n%s' "[y/n] "
@@ -137,7 +137,7 @@ usePlainText() {
 usePlainTextMenu() {
     clear
     tput bold
-    shift; printf "${1:2}\n"; shift; shift
+    shift; printf '%s\n' "${1:2}"; shift; shift
     tput sgr0
     local i=1; for item in "$@"; do
         echo "$item" | grep -qE '[0-9]+' && continue
@@ -154,7 +154,7 @@ usePlainTextMenu() {
         read -n 1 -r -s readVar
     done
     printf "\n"
-    printf "$readVar" 1>&2
+    printf '%s' "$readVar" 1>&2
 }
 
 getLastArgument() {
@@ -190,8 +190,8 @@ useDialogMenu() {
 }
 
 calcWidthWhiptail() {
-    width=$(echo "$1" | wc -c)
-    [ $width -gt 60 ] && echo 60 || echo $((width+2))
+    width=${#1}
+    [ "$width" -gt 60 ] && echo 60 || echo $((width+2))
 }
 
 calcWidthDialog() {
diff --git a/scripts/update.sh b/scripts/update.sh
index 437a585..24a37be 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,6 +2,6 @@
 
 git submodule update --remote --merge
 gitStatus=$(git status --porcelain)
-grep -q "sadedot" <(echo $gitStatus) || return
+grep -q "sadedot" <(echo "$gitStatus") || return
 git commit -m "Update sadedot submodule" sadedot
 git push