From a6e57554354e33ecfc2dccb88eb3399f36a4d54f Mon Sep 17 00:00:00 2001 From: david Date: Thu, 16 May 2024 08:31:58 +0200 Subject: [PATCH] Adding prefix parameter to warp4j --- warp4j | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/warp4j b/warp4j index ce09222..19f788a 100755 --- a/warp4j +++ b/warp4j @@ -19,6 +19,10 @@ function print_help { echo ' override output directory;' echo ' this is relative to current PWD' echo ' (default: ./warped)' + echo ' -p, --prefix ' + echo ' if set, warp-packer will use the prefix' + echo ' as target folder in which the ' + echo ' application should be extracted' echo ' --list show available java releases;' echo ' takes into consideration other options:' echo ' "--java-version", "--no-optimize", "--jvm-impl";' @@ -128,6 +132,10 @@ while [[ $# -gt 0 ]]; do CLASS_PATH="$2" shift 2 ;; + --auto-class-path) + AUTO_CLASS_PATH=true + shift + ;; -j|--java-version) JAVA_VERSION="$2" JAVA_VERSION_OVERRIDEN=true @@ -137,6 +145,10 @@ while [[ $# -gt 0 ]]; do OUTPUT_DIR_PATH="$2" shift 2 ;; + -p|--prefix) + PREFIX="--prefix $2" + shift 2 + ;; --list) LIST_RELEASES=true shift @@ -165,10 +177,6 @@ while [[ $# -gt 0 ]]; do JVM_OPTIONS="$2" shift 2 ;; - --auto-class-path) - AUTO_CLASS_PATH=true - shift - ;; -s|--silent) SILENT=true shift @@ -559,7 +567,7 @@ function ensure_distro_cached() { distro_link=$(find_distro_link "$distro_info" $CONCRETE_JAVA_VERSION) download_distro $platform $architecture $CONCRETE_JAVA_VERSION "$distro_link" else - CONCRETE_JAVA_VERSION=$(find_latest_cached $architecture $platform $JAVA_VERSION) + CONCRETE_JAVA_VERSION=$(find_latest_cached $platform $architecture $JAVA_VERSION) fi fi else @@ -742,8 +750,11 @@ function warp_targets() { echo "Warping for $LIN..." mkdir -p "$WARPED_TEMP_PATH/$LIN" warp-packer \ + pack \ + --unique-id \ + $PREFIX \ --arch linux-x64 \ - --input_dir "$BUNDLES_PATH/$LIN" \ + --input-dir "$BUNDLES_PATH/$LIN" \ --exec "$LAUNCHER_NAME.sh" \ --output "$WARPED_TEMP_PATH/$LIN/$APP_NAME" \ &> /dev/null @@ -760,8 +771,11 @@ function warp_targets() { echo "Warping for $MAC..." mkdir -p "$WARPED_TEMP_PATH/$MAC" warp-packer \ + pack \ + --unique-id \ + $PREFIX \ --arch macos-x64 \ - --input_dir "$BUNDLES_PATH/$MAC" \ + --input-dir "$BUNDLES_PATH/$MAC" \ --exec "$LAUNCHER_NAME.sh" \ --output "$WARPED_TEMP_PATH/$MAC/$APP_NAME" \ &> /dev/null @@ -778,8 +792,11 @@ function warp_targets() { echo "Warping for $WIN..." mkdir -p "$WARPED_TEMP_PATH/$WIN" warp-packer \ + pack \ + --unique-id \ + $PREFIX \ --arch windows-x64 \ - --input_dir "$BUNDLES_PATH/$WIN" \ + --input-dir "$BUNDLES_PATH/$WIN" \ --exec "$LAUNCHER_NAME.cmd" \ --output "$WARPED_TEMP_PATH/$WIN/$APP_NAME.exe" \ &> /dev/null