diff --git a/internal/ota_push.sh b/internal/ota_push.sh index 43b9249..3c1f5a8 100755 --- a/internal/ota_push.sh +++ b/internal/ota_push.sh @@ -28,8 +28,8 @@ fi process_file() { local NAME=$1 - local HASH=$(cat $OTA_JSON | jq -r ".[] | select(.name == \"$NAME\") | .hash_raw") - local FILE_NAME="$NAME-$HASH.img.xz" + local HASH_RAW=$(cat $OTA_JSON | jq -r ".[] | select(.name == \"$NAME\") | .hash_raw") + local FILE_NAME="$NAME-$HASH_RAW.img.xz" local CLOUD_PATH="https://$DATA_ACCOUNT.blob.core.windows.net/$DATA_CONTAINER/$FILE_NAME" echo "Copying $NAME to the cloud..." @@ -37,8 +37,8 @@ process_file() { echo " $CLOUD_PATH" # if [ "$NAME" == "system" ]; then - # local CAIBX_FILE_NAME="system-$HASH.caibx" - # local CHUNKS_FOLDER="system-$HASH" + # local CAIBX_FILE_NAME="system-$HASH_RAW.caibx" + # local CHUNKS_FOLDER="system-$HASH_RAW" # echo "Copying system.caibx to the cloud..." # local SYSTEM_CAIBX_PATH="https://$DATA_ACCOUNT.blob.core.windows.net/$DATA_CONTAINER/$CAIBX_FILE_NAME" diff --git a/internal/package_ota.sh b/internal/package_ota.sh index c0cad30..6abd75a 100755 --- a/internal/package_ota.sh +++ b/internal/package_ota.sh @@ -42,7 +42,7 @@ process_file() { # echo "Creating system casync files" - # casync make --compression=xz --store $OTA_OUTPUT_DIR/system-$HASH $OTA_OUTPUT_DIR/system-$HASH.caibx $FILE_RAW + # casync make --compression=xz --store $OTA_OUTPUT_DIR/system-$HASH_RAW $OTA_OUTPUT_DIR/system-$HASH_RAW.caibx $FILE_RAW rm $FILE_RAW fi @@ -64,8 +64,8 @@ process_file() { echo " \"sparse\": $SPARSE," >> $OUTPUT_JSON echo " \"full_check\": $FULL_CHECK," >> $OUTPUT_JSON echo " \"has_ab\": $HAS_AB" >> $OUTPUT_JSON - # echo " \"casync_caibx\": \"$AGNOS_UPDATE_URL/$NAME-$HASH.caibx\"," >> $OUTPUT_JSON - # echo " \"casync_store\": \"$AGNOS_UPDATE_URL/$NAME-$HASH\"" >> $OUTPUT_JSON + # echo " \"casync_caibx\": \"$AGNOS_UPDATE_URL/$NAME-$HASH_RAW.caibx\"," >> $OUTPUT_JSON + # echo " \"casync_store\": \"$AGNOS_UPDATE_URL/$NAME-$HASH_RAW\"" >> $OUTPUT_JSON echo " }," >> $OUTPUT_JSON echo " {" >> $OUTPUT_STAGING_JSON @@ -77,8 +77,8 @@ process_file() { echo " \"sparse\": $SPARSE," >> $OUTPUT_STAGING_JSON echo " \"full_check\": $FULL_CHECK," >> $OUTPUT_STAGING_JSON echo " \"has_ab\": $HAS_AB" >> $OUTPUT_STAGING_JSON - # echo " \"casync_caibx\": \"$AGNOS_STAGING_UPDATE_URL/$NAME-$HASH.caibx\"," >> $OUTPUT_STAGING_JSON - # echo " \"casync_store\": \"$AGNOS_STAGING_UPDATE_URL/$NAME-$HASH\"" >> $OUTPUT_STAGING_JSON + # echo " \"casync_caibx\": \"$AGNOS_STAGING_UPDATE_URL/$NAME-$HASH_RAW.caibx\"," >> $OUTPUT_STAGING_JSON + # echo " \"casync_store\": \"$AGNOS_STAGING_UPDATE_URL/$NAME-$HASH_RAW\"" >> $OUTPUT_STAGING_JSON echo " }," >> $OUTPUT_STAGING_JSON }