From 7f0d5eb0b236fc1dfd7bc42a35d855de5bdfddd2 Mon Sep 17 00:00:00 2001 From: idk Date: Sun, 9 Oct 2022 16:07:02 -0400 Subject: [PATCH] make it possible to overide archive builds when building on Linux to produce a Linux jpackage --- build.sh | 14 ++++++++------ targz.sh | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index 3deec23..0d26bdc 100755 --- a/build.sh +++ b/build.sh @@ -16,12 +16,14 @@ if [ -f config_overide.sh ]; then . "$SCRIPT_DIR/config_override.sh" fi -unameOut="$(uname -s)" -case "${unameOut}" in - Linux*) machine=Linux;; - Darwin*) machine=Mac;; - *) machine="UNKNOWN:${unameOut}" -esac +if [ -z $machine ]; then + unameOut="$(uname -s)" + case "${unameOut}" in + Linux*) machine=Linux;; + Darwin*) machine=Mac;; + *) machine="UNKNOWN:${unameOut}" + esac +fi if [ "$machine" = "Mac" ]; then rm -rf I2P diff --git a/targz.sh b/targz.sh index 1176f27..e47a9d5 100755 --- a/targz.sh +++ b/targz.sh @@ -8,7 +8,7 @@ cd "$SCRIPT_DIR" || exit 1 if [ -f "$SCRIPT_DIR/config_override.sh" ]; then . "$SCRIPT_DIR/config_override.sh" fi - +export machine=unix ./clean.sh wsl make distclean ./build.sh