summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-14 20:35:48 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-15 06:12:50 +0000
commit1aafa5a0c7b8a61021c5bb33539c3f0f4fd966bb (patch)
treeec535ac0f14b69f132f6ec30de0539bfdcadc9da
parentRenaming license file for consistency. (diff)
downloadsystem-build-1aafa5a0c7b8a61021c5bb33539c3f0f4fd966bb.tar.xz
system-build-1aafa5a0c7b8a61021c5bb33539c3f0f4fd966bb.zip
Renaming version file for consistency.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rw-r--r--Makefile2
-rw-r--r--VERSION.txt (renamed from VERSION)0
-rwxr-xr-xfunctions/common.sh2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f9ca1888d..b969e9b6d 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ build:
install:
# Installing shared data
mkdir -p $(DESTDIR)/usr/share/live/build
- cp -r data functions VERSION $(DESTDIR)/usr/share/live/build
+ cp -r data functions VERSION.txt $(DESTDIR)/usr/share/live/build
cp -r share/* $(DESTDIR)/usr/share/live/build
# Installing executables
diff --git a/VERSION b/VERSION.txt
index c2ace565c..c2ace565c 100644
--- a/VERSION
+++ b/VERSION.txt
diff --git a/functions/common.sh b/functions/common.sh
index 2edebc5da..9fbdc3fbf 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
PROGRAM="live-build"
-VERSION="$(if [ -e ${LIVE_BUILD}/VERSION ]; then cat ${LIVE_BUILD}/VERSION; else cat /usr/share/live/build/VERSION; fi)"
+VERSION="$(if [ -e ${LIVE_BUILD}/VERSION.txt ]; then cat ${LIVE_BUILD}/VERSION.txt; else cat /usr/share/live/build/VERSION.txt; fi)"
CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
# FIXME