From 840a5159b33d32ac7820c1ed926e83ba108e60ff Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 18 May 2021 23:44:43 -0700 Subject: [PATCH] Read .version file before changing into packaging directory --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 0a8c361..ceba2ef 100755 --- a/build.sh +++ b/build.sh @@ -478,6 +478,7 @@ host-jar() { check_submodules ARTIFACT="jar" + PKG_VERSION=$(cat .version) # Default to release BUILD_TYPE=${1:-release} if [[ $1 = *"docs"* ]]; then @@ -505,7 +506,7 @@ host-jar() export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 javac -Xlint:deprecation com/zerotier/sockets/*.java - jar cf libzt-"$(cat .version)".jar $SHARED_LIB_NAME com/zerotier/sockets/*.class + jar cf libzt-$PKG_VERSION.jar $SHARED_LIB_NAME com/zerotier/sockets/*.class rm -rf com $SHARED_LIB_NAME cd - # Copy JAR to dist/