From f7b837e43f99b8d771aa5d6b752f0487124ac96a Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Mon, 27 Feb 2017 07:40:16 +0900
Subject: [PATCH] Set build version
---
pkg/build.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pkg/build.sh b/pkg/build.sh
index 313bffa..9263cbb 100644
--- a/pkg/build.sh
+++ b/pkg/build.sh
@@ -6,8 +6,6 @@
PKGNAME='ocs-url'
-PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
-
BUILDTYPE=''
if [ "${1}" ]; then
BUILDTYPE="${1}"
@@ -18,7 +16,11 @@ if [ "${2}" ]; then
TREEISH="${2}"
fi
-BUILDDIR="${PROJDIR}/pkg/build_${TREEISH}"
+PROJDIR="$(cd "$(dirname "${0}")/../" && pwd)"
+
+BUILDVER="$(cd "${PROJDIR}" && git describe --always)"
+
+BUILDDIR="${PROJDIR}/build_${PKGNAME}_${BUILDVER}_${BUILDTYPE}"
SRCARCHIVE="${BUILDDIR}/${PKGNAME}.tar.gz"
@@ -127,7 +129,6 @@ pre_appimage() {
cd "${PROJDIR}"
mkdir -p "${BUILDDIR}"
export_srcarchive "${SRCARCHIVE}"
- export VERSION="$(git describe --always)"
}
build_appimage() {
--
GitLab