From 53e4bc2d38cfd8efaab4579341530f2c0e01bf85 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Tue, 19 May 2020 17:43:48 +0200 Subject: [PATCH] Armbian firmware recreation and image upload bugfix Cleaning was improper in case of retries Signed-off-by: Igor Pecovnik --- lib/build-all-ng.sh | 2 +- lib/main.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index ab64483925..aa1a17c712 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -113,7 +113,7 @@ pack_upload () if [[ -n "${SEND_TO_SERVER}" ]]; then ssh "${SEND_TO_SERVER}" "mkdir -p ${SEND_TO_LOCATION}${BOARD}/{archive,nightly}" & display_alert "Uploading" "Please wait!" "info" - nice -n 19 bash -c "rsync -arP --info=progress2 --ignore-existing --remove-source-files --prune-empty-dirs $DESTIMG/ -e 'ssh -T -c aes128-ctr -o Compression=no -x -p 22' ${SEND_TO_SERVER}:${SEND_TO_LOCATION}${BOARD}/${subdir}" & + nice -n 19 bash -c "rsync -arP --info=progress2 --prune-empty-dirs $DESTIMG/ -e 'ssh -T -c aes128-ctr -o Compression=no -x -p 22' ${SEND_TO_SERVER}:${SEND_TO_LOCATION}${BOARD}/${subdir}; rm -rf ${DESTIMG}/*" & else mv $DESTIMG/*.* $DEST/images/ fi diff --git a/lib/main.sh b/lib/main.sh index d3a71465b7..c3f5e41036 100644 --- a/lib/main.sh +++ b/lib/main.sh @@ -445,7 +445,7 @@ if [[ ! -f ${DEB_STORAGE}/armbian-config_${REVISION}_all.deb ]]; then fi # Compile armbian-firmware if packed .deb does not exist or use the one from repository -if [[ ! -f ${DEB_STORAGE}/armbian-firmware_${REVISION}_all.deb || ! -f $DEST/debs/armbian-firmware${FULL}_${REVISION}_all.deb ]]; then +if ! ls ${DEB_STORAGE}/armbian-firmware_${REVISION}_all.deb 1> /dev/null 2>&1 || ! ls ${DEB_STORAGE}/armbian-firmware-full_${REVISION}_all.deb 1> /dev/null 2>&1; then if [[ "${REPOSITORY_INSTALL}" != *armbian-firmware* ]]; then