fixed autoupdater usb regex

opencardev · Oct 17, 2020 · 4c3b830 · 4c3b830
1 parent edaa652
commit 4c3b830
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/crankshaft.yml b/.github/workflows/crankshaft.yml
@@ -61,7 +61,7 @@ jobs:
           BUILDHASH: ${{ steps.get_version.outputs.buildhash }}
           BUILDBRANCH: ${{ steps.get_version.outputs.buildbranch }} 
           BUILDDATE: ${{ steps.get_version.outputs.builddate }}  
-          IMG_VERSION: '${{ steps.get_version.outputs.builddate }}-${{ steps.get_version.outputs.version }}-${{ steps.get_version.outputs.buildhash }}'
+          IMG_VERSION: '${{ steps.get_version.outputs.builddate }}-${{ steps.get_version.outputs.buildbranch }}-${{ steps.get_version.outputs.buildhash }}'
       - 
         name: Run build
         id: build-docker

diff --git a/prebuilts b/prebuilts
diff --git a/stage3/03-crankshaft-base/files/opt/crankshaft/service_usbdetect.sh b/stage3/03-crankshaft-base/files/opt/crankshaft/service_usbdetect.sh
@@ -66,10 +66,10 @@ for FSMOUNTPOINT in $(ls -d /media/USBDRIVES/*); do
     fi
 
     if [ $ALLOW_USB_FLASH -eq 1 ]; then
-        UPDATEZIP=$(ls -Art /media/USBDRIVES/${PARTITION} | grep crankshaft-ng | grep .zip | grep -v md5 | grep -v ^._ | tail -1)
+        UPDATEZIP=$(ls -Art /media/USBDRIVES/${PARTITION} | grep 'crankshaft-ng\|csng' | grep .zip | grep -v md5 | grep -v ^._ | tail -1)
         FLAG=0
         if [ ! -z ${UPDATEZIP} ]; then
-            UNPACKED=$(unzip -l /media/USBDRIVES/${PARTITION}/${UPDATEZIP} | grep crankshaft-ng | grep .img | grep -v md5 | grep -v ^._ | awk {'print $4'})
+            UNPACKED=$(unzip -l /media/USBDRIVES/${PARTITION}/${UPDATEZIP} | grep 'crankshaft-ng\|csng' | grep .img | grep -v md5 | grep -v ^._ | awk {'print $4'})
             if [ ! -f /media/USBDRIVES/${PARTITION}/${UNPACKED} ]; then
                 show_clear_screen
                 echo "" > /dev/tty3
@@ -104,7 +104,7 @@ for FSMOUNTPOINT in $(ls -d /media/USBDRIVES/*); do
                 FLAG=1
             fi
         fi
-        UPDATEFILE=$(ls -Art /media/USBDRIVES/${PARTITION} | grep crankshaft-ng | grep .img | grep -v md5 | grep -v ^._ | tail -1)
+        UPDATEFILE=$(ls -Art /media/USBDRIVES/${PARTITION} | grep 'crankshaft-ng\|csng' | grep .img | grep -v md5 | grep -v ^._ | tail -1)
         if [ ! -z ${UPDATEFILE} ]; then
             if [ ${FLAG} -ne 1 ]; then
                 show_clear_screen