Another set of linter fixes

netinvent · Nov 5, 2024 · 4eb4358 · 4eb4358
1 parent f45087c
commit 4eb4358
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/optional_tasks/setup_hypervisor.sh b/optional_tasks/setup_hypervisor.sh
@@ -194,7 +194,7 @@ echo "#### Cleanup system files ####"
 /bin/rm -rf /var/lib/authselect/backups/*
 #/bin/rm -rf /var/log/anaconda
 
-if [ $SCRIPT_GOOD == false ]; then
+if [ "${SCRIPT_GOOD}" == false ]; then
     echo "#### WARNING Installation FAILED ####"
     exit 1
 else

diff --git a/optional_tasks/setup_opnsense.sh b/optional_tasks/setup_opnsense.sh
@@ -122,10 +122,10 @@ done
 
 qemu-img create -f qcow2 -o extended_l2=on -o preallocation=metadata "${FULL_DISKPATH}" "${DISK_SIZE}" || log_quit "Failed to create disk"
 chown qemu:qemu "${FULL_DISKPATH}" || log "Failed to change disk owner" "ERROR"
-virt-install --name "${VM}" --ram "${RAM}" --vcpus "${VCPUS}" --cpu host --os-variant "${OS_VARIANT}" --disk path="${FULL_DISKPATH/${VM}-disk0.qcow2,bus=virtio,cache=none${IO_MODE}" --channel unix,mode=bind,target_type=virtio,name=org.qemu.guest_agent.0 --watchdog i6300esb,action=reset --sound none --boot hd --autostart --sysinfo smbios,bios.vendor=npf --sysinfo smbios,system.manufacturer=NetPerfect --sysinfo smbios,system.product="${PRODUCT}" --cdrom "${ISO}" --graphics vnc,listen=127.0.0.1,keymap=fr --autoconsole text "${PCI_PASSTHROUGH}"
+virt-install --name "${VM}" --ram "${RAM}" --vcpus "${VCPUS}" --cpu host --os-variant "${OS_VARIANT}" --disk path="${FULL_DISKPATH},bus=virtio,cache=none${IO_MODE}" --channel unix,mode=bind,target_type=virtio,name=org.qemu.guest_agent.0 --watchdog i6300esb,action=reset --sound none --boot hd --autostart --sysinfo smbios,bios.vendor=npf --sysinfo smbios,system.manufacturer=NetPerfect --sysinfo smbios,system.product="${PRODUCT}" --cdrom "${ISO}" --graphics vnc,listen=127.0.0.1,keymap=fr --autoconsole text "${PCI_PASSTHROUGH}"
 [ $? -ne 0 ] && log "Failed to launch virt-install" "ERROR"
 
-if [ $SCRIPT_GOOD == false ]; then
+if [ "${SCRIPT_GOOD}" == false ]; then
     echo "#### WARNING Installation FAILED ####"
     exit 1
 else

diff --git a/optional_tasks/setup_readonly.sh b/optional_tasks/setup_readonly.sh
@@ -175,7 +175,7 @@ EOF
 }
 
 
-RHEL_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d'"' -f2)
+RHEL_VERSION=$(grep VERSION_ID /etc/os-release | cut -d'"' -f2)
 if [ "${RHEL_VERSION}" == "9.0" ] || [ "${RHEL_VERSION}" == "9.1" ] || [ "${RHEL_VERSION}" == "9.2" ] || [ "${RHEL_VERSION}" == "9.3" ]; then
     patch_readonly_root
 fi
@@ -189,7 +189,7 @@ fi
 ln -s /run/NetworkManager/resolv.conf /etc/resolv.conf || log "Cannot link /run/NetworkManager/resolv.conf to /etc/resolv.conf" "ERROR"
 
 
-if [ $SCRIPT_GOOD == false ]; then
+if [ "${SCRIPT_GOOD}" == false ]; then
     echo "#### WARNING Installation FAILED ####"
     exit 1
 else

diff --git a/optional_tasks/setup_simplehelp.sh b/optional_tasks/setup_simplehelp.sh
@@ -52,7 +52,7 @@ sleep 10
 echo "Is simplegateway running: "
 systemctl is-active simplegateway 2>> "${LOG_FILE}" || log "Simplegateway is not running" "ERROR"
 
-if [ $SCRIPT_GOOD == false ]; then
+if [ "${SCRIPT_GOOD}" == false ]; then
     echo "#### WARNING Installation FAILED ####"
     exit 1
 else