scripts: fix syntax errors resulting from moving code around

Additionally, cut out the /dev/ prefix
SolidHal · Dec 26, 2020 · bf639d7 · bf639d7
1 parent ad15926
commit bf639d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/kernel/resources/shared/FlashKernelPartition.sh b/kernel/resources/shared/FlashKernelPartition.sh
@@ -33,10 +33,10 @@ get_device() {
 }
 
 get_emmc_devname() {
-    local devname=$(ls /dev/mmcblk* | grep -F boot0 | sed "s/boot0//")
-    if [ -z "$devname" ]
-    then
-        echo "Unknown device! can't determine emmc devname. Please file an issue with the output of fdisk -l if you get this on a supported device"; exit 1;;
+    local devname=$(ls /dev/mmcblk* | grep -F boot0 | sed "s/boot0//" | cut -d / -f 3)
+    if [ -z "$devname" ]; then
+        echo "Unknown device! can't determine emmc devname. Please file an issue with the output of fdisk -l if you get this on a supported device"
+        exit 1
     fi
     echo $devname
 }

diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh
@@ -34,10 +34,11 @@ get_device() {
 }
 
 get_emmc_devname() {
-    local devname=$(ls /dev/mmcblk* | grep -F boot0 | sed "s/boot0//")
+    local devname=$(ls /dev/mmcblk* | grep -F boot0 | sed "s/boot0//" | cut -d / -f 3)
     if [ -z "$devname" ]
     then
-        echo "Unknown device! can't determine emmc devname. Please file an issue with the output of fdisk -l if you get this on a supported device"; exit 1;;
+        echo "Unknown device! can't determine emmc devname. Please file an issue with the output of fdisk -l if you get this on a supported device"
+        exit 1
     fi
     echo $devname
 }

diff --git a/scripts/InstallScripts/InstallPrawnOS.sh b/scripts/InstallScripts/InstallPrawnOS.sh
@@ -37,10 +37,10 @@ get_device() {
 }
 
 get_emmc_devname() {
-    local devname=$(ls /dev/mmcblk* | grep -F boot0 | sed "s/boot0//")
-    if [ -z "$devname" ]
-    then
-        echo "Unknown device! can't determine emmc devname. Please file an issue with the output of fdisk -l if you get this on a supported device"; exit 1;;
+    local devname=$(ls /dev/mmcblk* | grep -F boot0 | sed "s/boot0//" | cut -d / -f 3)
+    if [ -z "$devname" ]; then
+        echo "Unknown device! can't determine emmc devname. Please file an issue with the output of fdisk -l if you get this on a supported device"
+        exit 1
     fi
     echo $devname
 }