Testing new update method

hzchaoqi · Oct 26, 2022 · a989fb3 · a989fb3
1 parent 649b594
commit a989fb3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -97,7 +97,7 @@ jobs:
           zip -9 "arpl-${{ steps.build.outputs.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
           sha256sum update-list.yml > sha256sum
           yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do
-            (cd `dirname ${F}` && sha256sum `basename ${F}` > sha256sum)
+            (cd `dirname ${F}` && sha256sum `basename ${F}`) >> sha256sum
           done
           yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9j "update-${{ steps.build.outputs.VERSION }}.zip" sha256sum update-list.yml
 

diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -915,6 +915,10 @@ function updateMenu() {
         while IFS="=" read KEY VALUE; do
           mv /tmp/`basename "${KEY}"` "${VALUE}"
         done < <(readConfigMap "replace" "/tmp/update-list.yml")
+        while read F; do
+          [ -f "${F}" ] && rm -f "${F}"
+          [ -d "${F}" ] && rm -Rf "${F}"
+        done < <(readConfigArray "remove" "/tmp/update-list.yml")
         dialog --backtitle "`backtitle`" --title "Update arpl" --aspect 18 \
           --yesno "Arpl updated with success to ${TAG}!\nReboot?" 0 0
         [ $? -ne 0 ] && continue

diff --git a/img-gen.sh b/img-gen.sh
@@ -89,7 +89,7 @@ zip -9 "arpl-${VERSION}.vmdk-dyn.zip" arpl-dyn.vmdk
 zip -9 "arpl-${VERSION}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
 sha256sum update-list.yml > sha256sum
 yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | while read F; do
-  (cd `dirname ${F}` && sha256sum `basename ${F}` > sha256sum)
+  (cd `dirname ${F}` && sha256sum `basename ${F}`) >> sha256sum
 done
-yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9D "update-${VERSION}.zip" sha256sum update-list.yml
+yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml | xargs zip -9j "update-${VERSION}.zip" sha256sum update-list.yml
 rm -f sha256sum