Revert Shell check fixes (#144)

Author: ipsita-npg

standalone-node/installation_scripts/bootable-usb-prepare.sh

@@ -113,7 +113,7 @@ fi
 # Ask the password from cmd line 
 echo -n "Please Set the Password for $user_name: "
 stty -echo
-read -r password
+read password
 stty echo
 echo 
 
@@ -124,7 +124,7 @@ chmod 600 "$(pwd)/.psswd"
 # Validate the custom-cloud-init section
 if ! dpkg -s python3 > /dev/null 2>&1; then
     apt install -y python3 > /dev/null 2>&1
-    if ! apt install -y python3 > /dev/null 2>&1; then
+    if [ "$?" -ne 0 ]; then
         echo "Pyhon installation failed,please check!!"
     fi
 fi
@@ -136,7 +136,7 @@ START_MARKER="^services:"
 YAML_CONTENT=$(awk "/$START_MARKER/ {found=1} found" "$CONFIG_FILE")
 
 # Validate using Python
-if ! echo "$YAML_CONTENT" | python3 -c '
+echo "$YAML_CONTENT" | python3 -c '
 import sys, yaml
 
 try:
@@ -158,7 +158,9 @@ try:
 except yaml.YAMLError as e:
     print("Custom cloud-init YAML is invalid:\n", e)
     sys.exit(1)
-'; then
+'
+# Catch the Error
+if [ "$?" -ne 0 ]; then
     echo "Custome cloud-init file is not valiad,Please check!!"
     exit 1
 fi
@@ -338,7 +340,7 @@ copy_files() {
         echo "Custom files copied!"
     fi
     # Remove the hidden password file
-    rm -rf "$(pwd)/.psswd"
+    rm -rf $(pwd)/.psswd
 }
 copy_user_apps() {
     echo "Copying user-apps to USB device..."
@@ -347,30 +349,30 @@ copy_user_apps() {
         if [[ $USB_DEVICE == /dev/nbd* ]]; then
             USER_APPS_PART="p$USER_APPS_PART"
         fi
-	check_mnt_mount_exist
-        mount "${USB_DEVICE}${USER_APPS_PART}" /mnt
+        check_mnt_mount_exist
+        mount ${USB_DEVICE}${USER_APPS_PART} /mnt
         # Use rsync for fater copr
-	if dpkg -s rsync; then 
-	    rsync -ah --inplace user-apps /mnt/
-	    if rsync -ah --inplace user-apps /mnt/; then 
-	        echo "user-apps data copied successfully"
-	    else
-		echo "user-apps data failes to copy please check!!"
-		umount /mnt
-		exit 1
-	    fi
-	else 
-	    cp -r user-apps /mnt
-	    if cp -r user-apps /mnt; then
+        if dpkg -s rsync; then 
+            rsync -ah --inplace user-apps /mnt/
+            if [ "$?" -eq 0 ]; then 
+                echo "user-apps data copied successfully"
+            else
+                echo "user-apps data failes to copy please check!!"
+                umount /mnt
+                exit 1
+            fi
+        else 
+            cp -r user-apps /mnt
+            if [ "$?" -eq 0 ]; then
                 echo "user-apps data copied successfully"
             else
                 echo "user-apps data failes to copy please check!!"
                 umount /mnt
                 exit 1
             fi
-	fi
-	umount /mnt
-	sync
+        fi
+        umount /mnt
+        sync
     fi
 }
 

standalone-node/installation_scripts/standalone-vm-setup.sh

@@ -25,7 +25,7 @@ deploy_mode=$(grep '^deploy_envmt=' "$CONFIG_FILE" | cut -d '=' -f2)
 deploy_mode=$(echo "$deploy_mode" | tr -d '"')
 
 if [ "$deploy_mode" != "ven" ]; then
-    echo "Please Make sure update the deploy_envmt=\"ven\" in config-file"
+    echo "Please Make sure update the deploy_envmt="ven" in config-file"
     exit 1
 fi
 
@@ -42,7 +42,8 @@ fi
 if ! dpkg -s qemu-system-x86 >/dev/null 2>&1; then
     echo  "Installing qemu-system-x86.., Please Wait!!"
     apt update
-    if ! apt install -y qemu-system-x86 >/dev/null 2>&1; then
+    apt install -y qemu-system-x86 >/dev/null 2>&1
+    if [ "$?" -ne 0 ]; then
         echo "Qemu Installation Failed,Please check!!"
         exit 1
     fi	
@@ -81,9 +82,10 @@ fi
 ./bootable-usb-prepare.sh /dev/nbd0 usb-bootable-files.tar.gz config-file || { echo "USB device setup failed,please check"; exit 1; }
 
 # Copy the new image if its provided
-if [ -n "$new_img" ]; then
+if [ ! -z "$new_img" ]; then
     mount /dev/nbd0p5 /mnt
-    find /mnt -mindepth 1 -delete 2>/dev/null || true
+    rm -rf /mnt/*
+    cp $new_img /mnt
     cp "$new_img" /mnt
     umount /mnt
     sync
@@ -113,9 +115,9 @@ sudo -E qemu-system-x86_64  \
   -drive file=/dev/nbd0,format=raw,id=usb,if=none \
   -netdev user,id=net0,hostfwd=tcp::2222-:22 \
   -device e1000,netdev=net0
-
-if ! qemu-system-x86_64 -accel kvm -m 4096 -drive file=emt-disk.img,format=raw,if=virtio -drive file=/dev/nbd0,format=raw,if=virtio -netdev user,id=net0,hostfwd=tcp::2222-:22 -device e1000,netdev=net0; then
-    echo "Intallation VM lacunh Failed,Please check!!"
+  
+if [ "$?" -ne 0 ]; then
+    echo "Intallation VM launch Failed,Please check!!"
 fi
 
 trap 'killall --quiet standalone-vm-launch.sh || true' EXIT 

standalone-node/installation_scripts/write-image-to-usb.sh

@@ -40,15 +40,15 @@ fi
 # Function to wipe filesystem signatures
 wipe_partition() {
     # Check existing filesystem signatures
-    echo "Checking existing filesystem signatures on ${USB_DEVICE}..."
+    echo "Checking existing filesystem signatures on "$USB_DEVICE"..."
     wipefs --all --no-act "$USB_DEVICE"
 
     # Prompt user for confirmation
-    read -r -p "Do you want to wipe all filesystem signatures from ${USB_DEVICE}? (yes/no): " user_input
+    read -p "Do you want to wipe all filesystem signatures from "$USB_DEVICE"? (yes/no): " user_input
 
     if [[ "$user_input" == "yes" ]]; then
         # Wipe filesystem signatures
-        echo "Wiping filesystem signatures from ${USB_DEVICE}..."
+        echo "Wiping filesystem signatures from "$USB_DEVICE"..."
         wipefs --all "$USB_DEVICE" || {
             echo "Error: Failed to wipe filesystem signatures from $USB_DEVICE"
             exit 1
@@ -93,7 +93,7 @@ sgdisk -e "$USB_DEVICE" >/dev/null 2>&1
 blockdev --rereadpt "${USB_DEVICE}"
 
 # Create a new partition table
-echo "Creating a new parition table on ${USB_DEVICE}"
+echo "Creating a new parition table on "${USB_DEVICE}" "
 create_partition() {
     local start=$1
     local end=$2
@@ -128,17 +128,17 @@ copy_to_partition() {
     while [ $attempt -lt $retries ]; do
         if mount "${USB_DEVICE}${part}" "$mount_dir" && rsync --progress "$src" "$mount_dir"; then
             if umount "$mount_dir"; then
-                echo "Successfully copied $src to ${mount_dir} on partition ${USB_DEVICE}${part}."
+                echo "Successfully copied $src to "$mount_dir" on partition ${USB_DEVICE}${part}."
                 break
             fi
         else
-            echo "Error: Failed to copy $src to ${mount_dir} on attempt $((attempt + 1))/$retries. Retrying..."
+            echo "Error: Failed to copy $src to "$mount_dir" on attempt $((attempt + 1))/$retries. Retrying..."
             umount "$mount_dir" || true
             sleep 2
         fi
         attempt=$((attempt + 1))
         if [ "$attempt" -eq 2 ]; then
-            echo "Error: Failed to copy $src to ${mount_dir} after $retries attempts!"
+            echo "Error: Failed to copy $src to "$mount_dir" after $retries attempts!"
             exit 1
         fi
     done

standalone-node/provisioning_scripts/k3s-configure.sh

@@ -12,7 +12,7 @@ if [ ! -f "/var/lib/rancher/k3s_status" ]; then
     bash sen-k3s-installer.sh
 else
     echo "k3s is already installed and running. Skipping installation." | sudo tee /var/log/cluster-init.log | sudo tee /dev/tty1
-    cd /etc/cloud/ || exit
+    cd /etc/cloud/
     chmod +x k3s-setup-post-reboot.sh
     bash k3s-setup-post-reboot.sh
 fi

standalone-node/provisioning_scripts/os-partition.sh

@@ -50,13 +50,13 @@ else
         echo "Faild to mount the root file system for for swap entry update $disk"
         exit 1
     fi
-    mount "$rootfs_partition_disk" /mnt
+    mount $rootfs_partition_disk /mnt
     mount --bind /dev /mnt/dev
     mount --bind /dev/pts /mnt/dev/pts
     mount --bind /proc /mnt/proc
     mount --bind /sys /mnt/sys
     echo "UUID=$uuid swap swap default 0 2" >> /mnt/etc/fstab
-    status=$(grep -c "swap" /mnt/etc/fstab)
+    status=$(cat "/mnt/etc/fstab" | grep -c "swap")
     if [ "$status" -ge 1 ]; then
         echo "Successfuly created the swap partition for the disk $disk"
     else
@@ -94,7 +94,7 @@ else
 fi
 
 #get the last partition end point
-data_part_end=$(parted -m "$disk" unit GB print | grep "^$data_part_number" | cut -d: -f3 | sed 's/GB//')
+data_part_end=$(parted -m $disk unit GB print | grep "^$data_part_number" | cut -d: -f3 | sed 's/GB//')
 if echo "$data_part_end" | grep -qE '^[0-9]+\.[0-9]+$'; then
     data_part_end=$(printf "%.0f" "$data_part_end")
 fi
@@ -107,7 +107,7 @@ secondary_rootfs_disk_end=$((data_part_end_size+secondary_rootfs_disk_size))
 parted ---pretend-input-tty "${disk}" \
     resizepart "$data_part_number" "${data_part_end_size}GB" \
    	mkpart primary ext4 "${data_part_end_size}GB" "${secondary_rootfs_disk_end}GB"
-if ! parted ---pretend-input-tty "${disk}" resizepart "$data_part_number" "${data_part_end_size}GB" mkpart primary ext4 "${data_part_end_size}GB" "${secondary_rootfs_disk_end}GB"; then
+if [ $? -ne 0 ]; then
     echo "Partition resize for the disk ${disk} failed"
     exit 1
 else
@@ -116,7 +116,7 @@ fi
 partprobe "${disk}"
 
 #get the end size of the last partition from the  disk
-last_partition_end=$(parted -ms "$disk" print | tail -n 1 | awk -F: '{print $3}' | sed 's/GB$//')
+last_partition_end=$(parted -ms $disk  print | tail -n 1 | awk -F: '{print $3}' | sed 's/GB$//')
 if echo "$last_partition_end" | grep -qE '^[0-9]+\.[0-9]+$'; then
         last_partition_end=$(printf "%.0f" "$last_partition_end")
 fi
@@ -127,7 +127,8 @@ create_swap_partition "${disk}" "${last_partition_end}" "${swap_partition_size_e
 
 #finally expand the data partition using resize2fs
 e2fsck -f -y "$data_partition_disk"
-if ! resize2fs "$data_partition_disk"; then
+resize2fs "$data_partition_disk"
+if [ $? -ne 0 ]; then
     echo "Partition resize for the disk ${disk} failed"
     exit 1
 else