diff --git a/.gitattributes b/.gitattributes index aacc8a9..13318b1 100755 --- a/.gitattributes +++ b/.gitattributes @@ -2,5 +2,5 @@ ** text eol=lf # Denote all files that are truly binary and should not be modified. -module/bin/**/** binary +module/bin/*/* binary *.png binary diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b22258..c9521d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,16 +27,30 @@ jobs: - name: Update dependency run: | curl -Ls https://cdn.jsdelivr.net/npm/marked/marked.min.js > module/webui/scripts/assets/marked.min.js + wget -q $(curl -Ls https://api.github.com/repos/KOWX712/openssl-static-build/releases/latest | jq -r '.assets[].browser_download_url') -O openssl.tar.gz + tar -xzf openssl.tar.gz + mv openssl-arm64 module/bin/arm64-v8a/openssl + mv openssl-arm32 module/bin/armeabi-v7a/openssl # Commit if found changes - if ! git diff --exit-code module/webui/scripts/assets/marked.min.js > /dev/null; then - git config --global user.email "github-actions[bot]@users.noreply.github.com" - git config --global user.name "github-actions[bot]" + git config --global user.email "github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + + # Commit marked.min.js if changed + if git status --porcelain | grep 'module/webui/scripts/assets/marked.min.js'; then git add module/webui/scripts/assets/marked.min.js git commit -m "deps: update marked.min.js" - git push fi + # Commit OpenSSL files if changed + if git status --porcelain | grep -E 'module/bin/arm64-v8a|module/bin/armeabi-v7a'; then + git add module/bin/arm64-v8a/openssl module/bin/armeabi-v7a/openssl + git commit -m "deps: update OpenSSL binaries" + fi + + # Push all commits + git push + - name: Extract Module Info id: extract_info run: | diff --git a/module/install_func.sh b/module/install_func.sh index af23c84..52815d6 100644 --- a/module/install_func.sh +++ b/module/install_func.sh @@ -17,8 +17,9 @@ initialize() { # Set aapt binary cp "$MODPATH/module.prop" "$COMPATH/update/module.prop" - mv "$MODPATH/bin/$(getprop ro.product.cpu.abi)/aapt" "$COMPATH/aapt" + mv "$MODPATH/bin/$(getprop ro.product.cpu.abi)/"* "$COMPATH/" set_perm $COMPATH/aapt 0 2000 0755 + set_perm $COMPATH/openssl 0 2000 0755 rm -rf "$MODPATH/bin" }