From c700852936518f7f7606e7b1a2d7d34c60273303 Mon Sep 17 00:00:00 2001
From: mfgbhatti <mfgbhatti@live.com>
Date: Mon, 24 Jan 2022 20:08:52 +0000
Subject: [PATCH] clearing bash syntax issues

---
 startup.sh | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/startup.sh b/startup.sh
index 1aa56bb..b46bb6f 100644
--- a/startup.sh
+++ b/startup.sh
@@ -6,16 +6,16 @@
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 # set up a config file
 CONFIG_FILE=$SCRIPT_DIR/setup.conf
-if [ ! -f $CONFIG_FILE ]; then # check if file exists
-    touch -f $CONFIG_FILE # create file if not exists
+if [ ! -f "$CONFIG_FILE" ]; then # check if file exists
+    touch -f "$CONFIG_FILE" # create file if not exists
 fi
 
 # set options in setup.conf
 set_option() {
-    if grep -Eq "^${1}.*" $CONFIG_FILE; then # check if option exists
-        sed -i -e "/^${1}.*/d" $CONFIG_FILE # delete option if exists
+    if grep -Eq "^${1}.*" "$CONFIG_FILE"; then # check if option exists
+        sed -i -e "/^${1}.*/d" "$CONFIG_FILE" # delete option if exists
     fi
-    echo "${1}=${2}" >>$CONFIG_FILE # add option
+    echo "${1}=${2}" >> "$CONFIG_FILE" # add option
 }
 logo () {
 # This will be shown on every set as user is progressing
@@ -42,14 +42,14 @@ echo -ne "
     3)      luks with btrfs
     0)      exit
 "
-read FS
+read -r FS
 case $FS in
 1) set_option FS btrfs;;
 2) set_option FS ext4;;
 3) 
 echo -ne "Please enter your luks password: "
-read -s luks_password # read password without echo
-set_option luks_password $luks_password
+read -rs luks_password # read password without echo
+set_option luks_password "$luks_password"
 set_option FS luks;;
 0) exit ;;
 *) echo "Wrong option please select again"; filesystem;;
@@ -60,14 +60,14 @@ timezone () {
 time_zone="$(curl --fail https://ipapi.co/timezone)"
 echo -ne "System detected your timezone to be '$time_zone' \n"
 echo -ne "Is this correct? yes/no:" 
-read answer
+read -r answer
 case $answer in
     y|Y|yes|Yes|YES)
-    set_option TIMEZONE $time_zone;;
+    set_option TIMEZONE "$time_zone";;
     n|N|no|NO|No)
     echo "Please enter your desired timezone e.g. Europe/London :" 
-    read new_timezone
-    set_option TIMEZONE $new_timezone;;
+    read -r new_timezone
+    set_option TIMEZONE "$new_timezone";;
     *) echo "Wrong option. Try again";timezone;;
 esac
 }
@@ -104,7 +104,7 @@ Please select key board layout from this list
     -us
 
 "
-read -p "Your key boards layout:" keymap
+read -rp "Your key boards layout:" keymap
 set_option KEYMAP $keymap
 }
 
@@ -112,7 +112,7 @@ drivessd () {
 echo -ne "
 Is this an ssd? yes/no:
 "
-read ssd_drive
+read -r ssd_drive
 
 case $ssd_drive in
     y|Y|yes|Yes|YES)
@@ -136,20 +136,20 @@ echo -ne "
 
 Please enter full path to disk: (example /dev/sda):
 "
-read option
+read -r option
 echo "DISK=$option" >> setup.conf
 
 drivessd
-set_option DISK $option
+set_option DISK "$option"
 }
 userinfo () {
-read -p "Please enter your username: " username
-set_option USERNAME ${username,,} # convert to lower case as in issue #109 
+read -rp "Please enter your username: " username
+set_option USERNAME "${username,,} "# convert to lower case as in issue #109 
 echo -ne "Please enter your password: \n"
-read -s password # read password without echo
-set_option PASSWORD $password
-read -rep "Please enter your hostname: " nameofmachine
-set_option nameofmachine $nameofmachine
+read -rs password # read password without echo
+set_option PASSWORD "$password"
+read -rp "Please enter your hostname: " nameofmachine
+set_option nameofmachine "$nameofmachine"
 }
 # More features in future
 # language (){}