Merge pull request #296 from Waldz/hotfix/fix-standalone-packaging

HOTFIX: copy proper config files
mysteriumnetwork · Jul 13, 2018 · 62027fd · 62027fd
2 parents b84f64e + f30b7f6
commit 62027fd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/bin/client_build b/bin/client_build
@@ -16,7 +16,7 @@
 #> brew install readelf
 #> readelf -d build/client/mysterium_client
 
-source bin/helpers/functions.sh
+. ./bin/helpers/functions.sh
 
 export GOOS=${GOOS:-`go env GOHOSTOS`}
 export GOARCH=${GOARCH:-`go env GOHOSTARCH`}
@@ -31,7 +31,6 @@ fi
 
 mkdir -p $GOBIN/config
 
-cp -vp bin/client_package/config/$GOOS/* $GOBIN/config
-cp -vp bin/common_package/* $GOBIN/config
+copy_client_config $GOOS $GOBIN
 
 exit 0
diff --git a/bin/client_package_standalone b/bin/client_package_standalone
@@ -15,6 +15,7 @@
 set -e
 
 source bin/helpers/output.sh
+. ./bin/helpers/functions.sh
 
 OS=$1
 if [[ ! "$OS" =~ ^(linux|darwin|windows)$ ]]; then
@@ -28,9 +29,8 @@ DIR_BUILD="build/package"
 # Put all files to package directory (to avoid preserving directory structure)
 printf "Building Standalone package for OS '$OS' ..\n"
 DIR_TEMP=`mktemp -d ${DIR_BUILD}/${tempname}.XXXXXX`
-cp -p ${BINARY} ${DIR_TEMP}/mysterium_client
-cp -rp "bin/common_package/" ${DIR_TEMP}/config
-cp -rp "bin/client_package/config/${OS}/" ${DIR_TEMP}/config 2>/dev/null || true
+cp -vp ${BINARY} ${DIR_TEMP}/mysterium_client
+copy_client_config $OS $DIR_TEMP
 
 # Tarball package directory
 if [ "$OS" == "windows" ]; then

diff --git a/bin/helpers/functions.sh b/bin/helpers/functions.sh
@@ -7,3 +7,12 @@ function get_linker_ldflags {
     [ -n "$BUILD_NUMBER" ] && echo -n "-X 'github.com/mysterium/node/metadata.BuildNumber=${BUILD_NUMBER}' "
     [ -n "$BUILD_VERSION" ] && echo -n "-X 'github.com/mysterium/node/metadata.Version=${BUILD_VERSION}' "
 }
+
+function copy_client_config {
+    local OS_DIR=$1
+    local DST_DIR=$2
+    cp -vrp "bin/common_package/" ${DST_DIR}/config
+    if [[ -d "bin/client_package/config/${OS_DIR}/" ]]; then
+        cp -vrp "bin/client_package/config/${OS_DIR}/." ${DST_DIR}/config
+    fi
+}
diff --git a/bin/server_package_standalone b/bin/server_package_standalone
@@ -28,9 +28,9 @@ DIR_BUILD="build/package"
 # Put all files to package directory (to avoid preserving directory structure)
 printf "Building Standalone package for OS '$OS' ..\n"
 DIR_TEMP=`mktemp -d ${DIR_BUILD}/${tempname}.XXXXXX`
-cp -p ${BINARY} ${DIR_TEMP}/mysterium_server
-cp -rp "bin/common_package/" ${DIR_TEMP}/config
-cp -rp "bin/server_package/config/${OS}/" ${DIR_TEMP}/config 2>/dev/null || true
+cp -vp ${BINARY} ${DIR_TEMP}/mysterium_server
+cp -vrp "bin/common_package/" ${DIR_TEMP}/config
+cp -vrp "bin/server_package/config/." ${DIR_TEMP}/config
 
 # Tarball package directory
 if [ "$OS" == "windows" ]; then