From ab8da325d0b10b9ed6c67d43e3790e5067263d80 Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Tue, 4 Sep 2018 10:48:36 -0700
Subject: [PATCH] Improvements to distribution and packaging scripts

---
 packages/dist.sh    | 16 ++++++----------
 packages/package.sh |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/packages/dist.sh b/packages/dist.sh
index 3198e3d..6920e9b 100755
--- a/packages/dist.sh
+++ b/packages/dist.sh
@@ -91,7 +91,7 @@ build_all_products()
 				xcodebuild -target zt -configuration "$UPPERCASE_CONFIG" -sdk "iphoneos"
 				xcodebuild -target zt-static -configuration "$UPPERCASE_CONFIG" -sdk "iphoneos"
 				cd -
-				CURR_ARCH="arm64" # anything older should be built custom
+				CURR_ARCH="arm64" # spoof this architecture since HOSTTYPE is likely x86_64
 				CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/ios-$CURR_ARCH
 				mkdir -p $CURR_TMP_PRODUCT_DIR
 				mv $CURR_BUILD_PRODUCTS_DIR/*.framework $CURR_TMP_PRODUCT_DIR
@@ -104,8 +104,7 @@ build_all_products()
 					xcodebuild -target zt-static -configuration "$UPPERCASE_CONFIG" -sdk "macosx"
 					xcodebuild -target zt-shared -configuration "$UPPERCASE_CONFIG" -sdk "macosx"
 				cd -
-				CURR_ARCH=$HOSTTYPE
-				CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$CURR_ARCH
+				CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$(uname -m)
 				mkdir -p $CURR_TMP_PRODUCT_DIR
 				mv $CURR_BUILD_PRODUCTS_DIR/*.framework $CURR_TMP_PRODUCT_DIR
 				mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR
@@ -114,7 +113,7 @@ build_all_products()
 		# Android Archive (AAR) --- Executes a Gradle task
 		if true; then
 			CMAKE_FLAGS=$CMAKE_FLAGS" -DJNI=1"
-			CURR_ARCH="armeabi-v7a"
+			CURR_ARCH="armeabi-v7a" # spoof this architecture since HOSTTYPE is likely x86_64
 			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/android-$CURR_ARCH
 			mkdir -p $CURR_TMP_PRODUCT_DIR
 			echo "BUILDING: AAR"
@@ -126,8 +125,7 @@ build_all_products()
 		# Java Archive (JAR)
 		if true; then
 			CMAKE_FLAGS=$CMAKE_FLAGS" -DJNI=1"
-			CURR_ARCH=$HOSTTYPE
-			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$CURR_ARCH
+			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/macos-$(uname -m)
 			mkdir -p $CURR_TMP_PRODUCT_DIR
 			echo "BUILDING: JAR"
 			rm -rf $LIB_PRODUCTS_DIR # clean-lite
@@ -150,8 +148,7 @@ build_all_products()
 			cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DBUILD_TESTS=0"
 			cmake --build build
 			# -j $BUILD_CONCURRENCY
-			CURR_ARCH=$HOSTTYPE
-			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$CURR_ARCH
+			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$(uname -m)
 			mv $CURR_BUILD_PRODUCTS_DIR/libzt.* $CURR_TMP_PRODUCT_DIR
 		fi
 		# Java JAR file
@@ -160,8 +157,7 @@ build_all_products()
 			cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=$CONFIG "-DJNI=1 -DBUILD_TESTS=0"
 			cmake --build build
 			# -j $BUILD_CONCURRENCY
-			CURR_ARCH=$HOSTTYPE
-			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$CURR_ARCH
+			CURR_TMP_PRODUCT_DIR=$STAGING_DIR/$CONFIG/linux-$(uname -m)
 			mkdir -p $CURR_TMP_PRODUCT_DIR
 			cd $PROJROOT/packages/java
 			#cp $CURR_BUILD_PRODUCTS_DIR/libzt.so .
diff --git a/packages/package.sh b/packages/package.sh
index 4e5cf7f..a7e29ae 100755
--- a/packages/package.sh
+++ b/packages/package.sh
@@ -16,7 +16,7 @@ FINISHED_PRODUCTS_DIR=$(pwd)/products
 find . -type f \( -name '*.DS_Store' -o -name 'thumbs.db' \) -delete
 
 # Emit a README file
-echo $'* libzt version: '${LIBZT_VERSION}$'r'${LIBZT_REVISION}$'\n* Core ZeroTier version: '${ZT_CORE_VERSION}$'\n* date: '$(date)$'\n\nZeroTier Manual: https://www.zerotier.com/manual.shtml\n
+echo $'* libzt version: '${LIBZT_VERSION}$'r'${LIBZT_REVISION}$'\n* Core ZeroTier version: '${ZT_CORE_VERSION}$'\n* Date: '$(date)$'\n\nZeroTier Manual: https://www.zerotier.com/manual.shtml\n
 Other Downloads: https://www.zerotier.com/download.shtml
 \nlibzt Repo: https://github.com/zerotier/libzt' > ${STAGING_DIR}/README.md