diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2d1ca288..25411628 100644 --- 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 index 7bf1fee2..92f8ab3d 100755 --- 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 index 11db9ba8..d6f62b3c 100755 --- 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