andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only: support composite SUBFOLDER_TO_UPLOAD

This commit is contained in:
kifir23917 2024-07-17 16:50:33 +03:00 committed by rusefillc
parent d508934aa3
commit 8c202c95fd
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
firmware/bin/upload_bundle.sh
View File

@ -36,29 +36,32 @@ if [ -n "${USER}" -a -n "$PASS" -a -n "${HOST}" ]; then
FULL_BUNDLE_FILE="${WHITE_LABEL}_bundle_${BUNDLE_NAME}.zip" FULL_BUNDLE_FILE="${WHITE_LABEL}_bundle_${BUNDLE_NAME}.zip"
UPDATE_BUNDLE_FILE="${WHITE_LABEL}_bundle_${BUNDLE_NAME}_autoupdate.zip" UPDATE_BUNDLE_FILE="${WHITE_LABEL}_bundle_${BUNDLE_NAME}_autoupdate.zip"
# sftp does not support -p flag on mkdir :(
sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD
mkdir ${bundle_upload_folder}
SSHCMD
RET=0 RET=0
if [ "$AUTOMATION_LTS" == "true" -a -n "$AUTOMATION_REF" ]; then # lts build if [ "$AUTOMATION_LTS" == "true" -a -n "$AUTOMATION_REF" ]; then # lts build
DESTINATION_FOLDER="${bundle_upload_folder}/lts/${AUTOMATION_REF}" DESTINATION_SUBFOLDER="lts/${AUTOMATION_REF}"
# sftp does not support -p flag on mkdir :(
sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD
mkdir ${bundle_upload_folder}/lts
mkdir ${DESTINATION_FOLDER}
SSHCMD
elif [ -n "${SUBFOLDER_TO_UPLOAD}" ]; then # daily release with tag elif [ -n "${SUBFOLDER_TO_UPLOAD}" ]; then # daily release with tag
DESTINATION_FOLDER="${bundle_upload_folder}/${SHORT_BOARD_NAME}/${SUBFOLDER_TO_UPLOAD}" DESTINATION_SUBFOLDER="${SHORT_BOARD_NAME}/${SUBFOLDER_TO_UPLOAD}"
# sftp does not support -p flag on mkdir :( else
sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD DESTINATION_SUBFOLDER=""
mkdir ${bundle_upload_folder}/${SHORT_BOARD_NAME} fi
DESTINATION_FOLDER="${bundle_upload_folder}"
# sftp does not support -p flag on mkdir :(
sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD
mkdir ${DESTINATION_FOLDER} mkdir ${DESTINATION_FOLDER}
SSHCMD SSHCMD
else
DESTINATION_FOLDER="${bundle_upload_folder}" readarray -d "/" -t SUBFOLDER_ARRAY <<< "${DESTINATION_SUBFOLDER}"
fi for ((n=0; n < ${#SUBFOLDER_ARRAY[*]}; n++))
do
SUBFOLDER_COMPONENT="${SUBFOLDER_ARRAY[n]}"
if [ -n "${SUBFOLDER_COMPONENT}" ]; then
DESTINATION_FOLDER="${DESTINATION_FOLDER}/${SUBFOLDER_COMPONENT}"
sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD
mkdir ${DESTINATION_FOLDER}
SSHCMD
fi
done
# sftp does not support -p flag on mkdir :( # sftp does not support -p flag on mkdir :(
sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD sshpass -p $PASS sftp -o StrictHostKeyChecking=no ${USER}@${HOST} <<SSHCMD