summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2018-10-10 16:07:25 +0200
committerKarel Kočí <cynerd@email.cz>2018-10-10 16:07:25 +0200
commit6f880fd4e3ab6701845094613df166b1ff8b7250 (patch)
tree5bc1469441e50b77dce2b2abbf08a8e1dc0f2b99
parent0e3a0dab9c307be49c4994d31614f9ffb2985771 (diff)
downloadlaminar-cnf-6f880fd4e3ab6701845094613df166b1ff8b7250.tar.gz
laminar-cnf-6f880fd4e3ab6701845094613df166b1ff8b7250.tar.bz2
laminar-cnf-6f880fd4e3ab6701845094613df166b1ff8b7250.zip
turris{3,4}x: allow cleanup using CLEAN option
-rwxr-xr-xtemplates/turris3x.run2
-rwxr-xr-xtemplates/turris4x.run2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/turris3x.run b/templates/turris3x.run
index a9fb25d..c354b50 100755
--- a/templates/turris3x.run
+++ b/templates/turris3x.run
@@ -12,7 +12,7 @@ echo_stage "Get packages"
git_clone "git@cynerd.cz:openwrt-personal-pkgs" pkgs turris3x
SDK="$WORKSPACE/sdk.tar.bz2"
-if [ ! -e "$SDK" ] || [ $(expr $(date -u +%s) - $(stat -c %Z "$SDK")) -gt 86400 ]; then
+if [ -n "$CLEAN" ] || [ ! -e "$SDK" ] || [ $(expr $(date -u +%s) - $(stat -c %Z "$SDK")) -gt 86400 ]; then
echo_stage "Download SDK"
curl "$SDK_URI" > sdk.tar.bz2
mv sdk.tar.bz2 "$SDK"
diff --git a/templates/turris4x.run b/templates/turris4x.run
index 7118362..34bac9f 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -12,7 +12,7 @@ fi
curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash
cat git-hash
-if [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$WORKSPACE/openwrt-git-hash"; then
+if [ -z "$CLEAN" ] && [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$WORKSPACE/openwrt-git-hash"; then
echo_info "Using previous version of SDK"
flock --shared "$WORKSPACE/openwrt-sdk.lock" \
cp -a "$WORKSPACE/openwrt-sdk" openwrt