diff --git a/.github/workflows/custom.yml b/.github/workflows/custom.yml index 69f4f7e5..ad07d335 100644 --- a/.github/workflows/custom.yml +++ b/.github/workflows/custom.yml @@ -125,8 +125,8 @@ jobs: MODEL="${{ env.MODEL }}" writeConfigKey "model" "${MODEL}" "${PRESET_CONFIG_FILE}" PRODUCTVER="${{ env.PRODUCTVER }}" - PAT_URL="$(readConfigKey "\"${MODEL}\".\"${PATVER}\".url" "${PATS_CONFIG_FILE}")" - PAT_HASH="$(readConfigKey "\"${MODEL}\".\"${PATVER}\".sum" "${PATS_CONFIG_FILE}")" + PAT_URL="$(readConfigKey "\"${MODEL}\".\"${PRODUCTVER}\".url" "${PATS_CONFIG_FILE}")" + PAT_HASH="$(readConfigKey "\"${MODEL}\".\"${PRODUCTVER}\".sum" "${PATS_CONFIG_FILE}")" writeConfigKey "productver" "${PRODUCTVER:0:3}" "${PRESET_CONFIG_FILE}" writeConfigKey "paturl" "${PAT_URL}" "${PRESET_CONFIG_FILE}" writeConfigKey "pathash" "${PAT_HASH}" "${PRESET_CONFIG_FILE}" @@ -143,10 +143,10 @@ jobs: writeConfigKey "arc" "{}" "${PRESET_CONFIG_FILE}" writeConfigKey "automated" "true" "${PRESET_CONFIG_FILE}" echo "$(cat "${PRESET_CONFIG_FILE}")" - sudo echo "arc-${{ env.MODEL }}-${{ env.PRODUCTVER }}-${{ env.VERSION }}" >"/tmp/automated" + sudo echo "arc-${MODEL}-${PRODUCTVER:0:3}-${TAG}" >"/tmp/automated" sudo mv -f "/tmp/automated" "/tmp/p3/automated" DSM_FILE="${PAT_HASH}.tar" - DSM_URL="https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER}/${PAT_HASH}.tar" + DSM_URL="https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER:0:3}/${PAT_HASH}.tar" sudo curl -skL "${DSM_URL}" -o "/tmp/${DSM_FILE}" sudo mv -f "/tmp/${DSM_FILE}" "/tmp/p3/${DSM_FILE}" echo "Syncing files"