summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-08-04 13:19:37 +0200
committerDaniel Baumann <daniel@debian.org>2011-08-04 13:19:37 +0200
commit1deaeb04e59c4afd76d69b53d4e9ffc2a9a7b930 (patch)
treedb4b808d8ba46b69ffca5df390373e678546b9a3
parenta7a2aa23c68fd4e3718b6cde6a72b47a3f49ace2 (diff)
downloadvyos-live-build-1deaeb04e59c4afd76d69b53d4e9ffc2a9a7b930.tar.gz
vyos-live-build-1deaeb04e59c4afd76d69b53d4e9ffc2a9a7b930.zip
Adjusting check for target directory in live-build-cron scripts to fail if non-directories are used, thanks to Ben Armstrong <synrg@debian.org>.
-rwxr-xr-xcron/live-build-cron-images5
-rwxr-xr-xcron/live-build-cron-manual4
2 files changed, 7 insertions, 2 deletions
diff --git a/cron/live-build-cron-images b/cron/live-build-cron-images
index c76d96ed9..334d039f6 100755
--- a/cron/live-build-cron-images
+++ b/cron/live-build-cron-images
@@ -30,8 +30,11 @@ Init ()
exit 0
fi
- if [ -z "${LIVE_BUILD_CRON_IMAGES_DIRECTORY}" ]
+ mkdir -p "${LIVE_BUILD_CRON_IMAGES_DIRECTORY}"
+
+ if [ ! -d "${LIVE_BUILD_CRON_IMAGES_DIRECTORY}" ]
then
+ echo "E: live-build-cron-images directory not set."
exit 1
fi
diff --git a/cron/live-build-cron-manual b/cron/live-build-cron-manual
index de38a3287..7a7c4a0db 100755
--- a/cron/live-build-cron-manual
+++ b/cron/live-build-cron-manual
@@ -31,7 +31,9 @@ Init ()
exit 0
fi
- if [ -z "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}" ]
+ mkdir -p "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}"
+
+ if [ ! -d "${LIVE_BUILD_CRON_MANUAL_DIRECTORY}" ]
then
echo "E: live-build-cron-manual directory not set."
exit 1