summaryrefslogtreecommitdiff
path: root/functions/common.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-07-19 19:37:26 +0200
committerDaniel Baumann <daniel@debian.org>2012-07-19 21:11:59 +0200
commit8473b925fd94fdb7bb1ae6309a4ab58d490382c9 (patch)
tree94b76a6288395e37619b900f3eea2009a25d9b28 /functions/common.sh
parent6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a (diff)
downloadvyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.tar.gz
vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.zip
Fixing up inclusion of functions while allowing local usage of live-build with different file layouts.
Diffstat (limited to 'functions/common.sh')
-rwxr-xr-xfunctions/common.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/functions/common.sh b/functions/common.sh
index 538d180b0..19c3bc052 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
PROGRAM="live-build"
-VERSION="$(cat ${LB_BASE}/VERSION)"
+VERSION="$(if [ -e ${LIVE_BUILD}/VERSION ]; then cat ${LIVE_BUILD}/VERSION; else cat /usr/share/live/build/VERSION; fi)"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
PATH="${PWD}/local/scripts:${PATH}"