diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 7db45a04..c24cb848 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -33,7 +33,8 @@ jobs: sudo timedatectl set-timezone "Europe/Berlin" sudo apt update - sudo apt install -y jq gawk cpio gettext libelf-dev qemu-utils busybox dialog curl sed + sudo apt install -y jq gawk cpio gettext libelf-dev qemu-utils busybox dialog curl sed + sudo pip install bs4 sudo snap install yq df -h diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4adf2695..44873d5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,7 +66,8 @@ jobs: sudo timedatectl set-timezone "Europe/Berlin" sudo apt update - sudo apt install -y jq gawk cpio gettext libelf-dev qemu-utils busybox dialog curl sed + sudo apt install -y jq gawk cpio gettext libelf-dev qemu-utils busybox dialog curl sed + sudo pip install bs4 sudo snap install yq df -h diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index f0c162a5..b6684682 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -655,7 +655,7 @@ function make() { if [ "${OFFLINE}" == "false" ]; then while true; do PJ="$(python ${ARC_PATH}/include/functions.py getpats4mv -m "${MODEL}" -v "${PRODUCTVER}")" - if [ -z "${PJ}" || "${PJ}" = "{}" ]; then + if [ -z "${PJ}" ] || [ "${PJ}" = "{}" ]; then MSG="Unable to connect to Synology API, Please check the network and try again!" dialog --backtitle "$(backtitle)" --colors --title "Arc Build" \ --yes-label "Retry" \ @@ -671,7 +671,7 @@ function make() { [ ${RET} -ne 0 ] && return PV=$(cat ${TMP_PATH}/resp) PAT_URL=$(echo "${PJ}" | jq -r ".\"${PV}\".url") - PAT_SUM=$(echo "${PJ}" | jq -r ".\"${PV}\".sum") + PAT_HASH=$(echo "${PJ}" | jq -r ".\"${PV}\".sum") URLVER="$(echo "${PV}" | cut -d'.' -f1,2)" [ "${PRODUCTVER}" != "${URLVER}" ] && PRODUCTVER="${URLVER}" writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}"