minor updates

GiuseppeMP · Dec 26, 2020 · 52341d2 · 52341d2
1 parent af79bf7
commit 52341d2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/edit-options.sh b/edit-options.sh
@@ -14,8 +14,7 @@ SCRIPT_NAME="edit-options.sh"
 #
 # $ sudo ./edit-options.sh
 #
-if [ $EUID -ne 0 ]
-then
+if [[ $EUID -ne 0 ]]; then
 	echo "You must run this script with superuser (root) privileges."
 	echo "Try: \"sudo ./${SCRIPT_NAME}\""
 	exit 1

diff --git a/raspi32.sh b/raspi32.sh
@@ -13,8 +13,7 @@
 sed -i 's/CONFIG_PLATFORM_I386_PC = y/CONFIG_PLATFORM_I386_PC = n/g' Makefile
 RESULT=$?
 
-if [ "$RESULT" != "0" ]
-then
+if [[ "$RESULT" != "0" ]]; then
 	echo "An error occurred and I386 support was not turned off in Makefile."
 	exit 1
 else
@@ -24,12 +23,10 @@ fi
 sed -i 's/CONFIG_PLATFORM_ARM_RPI = n/CONFIG_PLATFORM_ARM_RPI = y/g' Makefile
 RESULT=$?
 
-if [ "$RESULT" != "0" ]
-then
+if [[ "$RESULT" != "0" ]]; then
 	echo "An error occurred and Raspberry Pi OS (32 bit) support was not turned on in Makefile."
 	exit 1
 else
 	echo "Raspberry Pi OS (32 bit) support was turned on in Makefile as planned."
+	exit 0
 fi
-
-exit 0
diff --git a/raspi64.sh b/raspi64.sh
@@ -13,8 +13,7 @@
 sed -i 's/CONFIG_PLATFORM_I386_PC = y/CONFIG_PLATFORM_I386_PC = n/g' Makefile
 RESULT=$?
 
-if [ "$RESULT" != "0" ]
-then
+if [[ "$RESULT" != "0" ]]; then
 	echo "An error occurred and I386 support was not turned off in Makefile."
 	exit 1
 else
@@ -24,12 +23,10 @@ fi
 sed -i 's/CONFIG_PLATFORM_ARM64_RPI = n/CONFIG_PLATFORM_ARM64_RPI = y/g' Makefile
 RESULT=$?
 
-if [ "$RESULT" != "0" ]
-then
+if [[ "$RESULT" != "0" ]]; then
 	echo "An error occurred and Raspberry Pi OS (64 bit) support was not turned on in Makefile."
 	exit 1
 else
 	echo "Raspberry Pi OS (64 bit) support was turned on in Makefile as planned."
+	exit 0
 fi
-
-exit 0
diff --git a/remove-driver.sh b/remove-driver.sh
@@ -4,7 +4,7 @@ DRV_NAME="rtl8814au"
 DRV_VERSION="5.8.5.1"
 OPTIONS_FILE="8814au.conf"
 
-KRNL_VERSION=$(uname -r)
+KRNL_VERSION="$(uname -r)"
 SCRIPT_NAME="remove-driver.sh"
 
 if [[ $EUID -ne 0 ]]; then

diff --git a/save-log.sh b/save-log.sh
@@ -12,9 +12,8 @@ SCRIPT_NAME="save-log.sh"
 #
 # $ sudo ./edit-options.sh
 #
-if [ $EUID -ne 0 ]
-then
-	echo "You must run ${SCRIPT_NAME} with superuser priviliges."
+if [[ $EUID -ne 0 ]]; then
+	echo "You must run this script with superuser (root) privileges."
 	echo "Try: \"sudo ./${SCRIPT_NAME}\""
 	exit 1
 fi
@@ -25,13 +24,11 @@ rm -f -- rtw.log
 dmesg | cut -d"]" -f2- | grep "RTW" >> rtw.log
 RESULT=$?
 
-if [ "$RESULT" != "0" ]
-then
+if [[ "$RESULT" != "0" ]]; then
 	echo "An error occurred while running: ${SCRIPT_NAME}"
 	echo "Did you set a log level > 0 ?"
 	exit 1
 else
 	echo "rtw.log saved successfully."
+	exit 0
 fi
-
-exit 0