diff options
Diffstat (limited to 'tsp/scripts')
-rwxr-xr-x | tsp/scripts/common_prep_flash_conf.sh | 19 | ||||
-rwxr-xr-x | tsp/scripts/free_diskspace.sh | 13 |
2 files changed, 16 insertions, 16 deletions
diff --git a/tsp/scripts/common_prep_flash_conf.sh b/tsp/scripts/common_prep_flash_conf.sh index 48ddbed..1eca9b4 100755 --- a/tsp/scripts/common_prep_flash_conf.sh +++ b/tsp/scripts/common_prep_flash_conf.sh @@ -26,20 +26,23 @@ cd "${WORKDIR_REMOTE}" || exit ACTUAL_TARGET="${TARGET#headless-}" case "$TARGET" in *odroid*) - BOOT_IMG="$(pwd)/$(ls tizen-common_*-boot-*odroid*.tar.gz)" - USR_IMG="$(pwd)/$(ls tizen-common_*-wayland-*odroid*.tar.gz)" + BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*odroid*.tar.gz)" + USR_IMG="$(pwd)/$(ls tizen-*-wayland-*odroid*.tar.gz)" ;; *artik*) - BOOT_IMG="$(pwd)/$(ls tizen-common_*-boot-*artik*.tar.gz)" - USR_IMG="$(pwd)/$(ls tizen-common_*-3parts-*artik*.tar.gz)" + BOOT_IMG="$(pwd)/$(ls tizen-*-boot-*artik*.tar.gz)" + USR_IMG="$(pwd)/$(ls tizen-*-3parts-*artik*.tar.gz)" ;; *minnow*) - USR_IMG="$(pwd)/$(ls tizen-common_*_common-*-sda.raw.bz2)" - USR_IMG_BMAP="$(pwd)/$(ls tizen-common_*_common-*-sda.bmap)" + USR_IMG="$(pwd)/$(ls tizen-*.raw.bz2)" + USR_IMG_BMAP="$(pwd)/$(ls tizen-*.bmap)" ;; *mbr64*) - USR_IMG="$(pwd)/$(ls tizen-common_*-minimal-mbr-*.tar.gz)" - KERNEL="$(pwd)/$(ls tizen-common_*-minimal-mbr-*-vmlinuz-*)" + USR_IMG="$(pwd)/$(ls tizen-*-minimal-mbr-x86_64.tar.gz)" + KERNEL="$(pwd)/$(ls *-vmlinuz-*)" + ;; + *) + die "Unrecognized target" ;; esac diff --git a/tsp/scripts/free_diskspace.sh b/tsp/scripts/free_diskspace.sh index 9adf7d6..d497092 100755 --- a/tsp/scripts/free_diskspace.sh +++ b/tsp/scripts/free_diskspace.sh @@ -25,16 +25,13 @@ export TSP_DIR="$(CDPATH='' cd -- "$(dirname -- "$0")" && pwd -P)/.." for i in $(find "${WS_DOWNLOAD}" -maxdepth 1 -mindepth 1 -type d -mtime +1) do - DIFF_FILE="$(ls "$i"/diff-*.report)" - if [ -z "${DIFF_FILE}" ] - then - echo "Missing diff-*.report in: " "$i" - else - if grep -q "Snapshot" "${DIFF_FILE}" + for diff_file in $(find "$i" -type f -name diff.report) + do + if grep -q "Snapshot" "${diff_file}" then echo "Snapshot, skipping:" "$i" continue fi - fi - rm -vr "$i" + rm -vr "$(dirname "${diff_file}")" + done done |