Skip to content

Commit ca1b663

Browse files
Kevin Bad NameKevin Bad Name
authored andcommitted
Adding quotes to deal with user paths with spaces
1 parent 6d971f7 commit ca1b663

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

package-windows_x86_64.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
1717

1818
set -e
1919
ZIP=$JVM.zip
20-
export JAVA_HOME=$HOME/bin/java17/
21-
if test -d $JAVA_HOME/$JVM/; then
20+
export JAVA_HOME="$HOME/bin/java17/"
21+
if test -d "$JAVA_HOME/$JVM/"; then
2222
echo "$JAVA_HOME exists."
2323
else
24-
mkdir -p $JAVA_HOME
24+
mkdir -p "$JAVA_HOME"
2525
curl https://cdn.azul.com/zulu/bin/$ZIP -o $ZIP
2626
#unzip $ZIP -d $JAVA_HOME
27-
7z x $ZIP -o$JAVA_HOME
28-
mv $JAVA_HOME/$JVM/* $JAVA_HOME/
27+
7z x $ZIP -o"$JAVA_HOME"
28+
mv "$JAVA_HOME/$JVM/"* "$JAVA_HOME/"
2929
fi
30-
30+
echo "Compile wiht gradle"
3131
./gradlew shadowJar
3232
echo "Test jar in: $SCRIPT_DIR"
33-
DIR=$SCRIPT_DIR/lib/build/libs/
33+
DIR="$SCRIPT_DIR/lib/build/libs/"
3434
INPUT_DIR="$SCRIPT_DIR/input"
3535
JAR_NAME=lib.jar
3636
#$JAVA_HOME/bin/java.exe -jar $DIR/$JAR_NAME
@@ -41,7 +41,7 @@ cp splash.ico $NAME.ico
4141

4242

4343

44-
PACKAGE=$JAVA_HOME/bin/jpackage.exe
44+
PACKAGE="$JAVA_HOME/bin/jpackage.exe"
4545
mkdir -p "$INPUT_DIR"
4646
cp "$DIR/$JAR_NAME" "$INPUT_DIR/"
4747

@@ -50,7 +50,7 @@ cp "$DIR/$JAR_NAME" "$INPUT_DIR/"
5050
rm -rf temp*
5151
rm -rf $NAME
5252
# depends on WiX https://github.com/wixtoolset/wix3/releases
53-
$PACKAGE --input "$INPUT_DIR/" \
53+
"$PACKAGE" --input "$INPUT_DIR/" \
5454
--name "$NAME" \
5555
--main-jar "$JAR_NAME" \
5656
--main-class "$MAIN" \
@@ -62,10 +62,10 @@ $PACKAGE --input "$INPUT_DIR/" \
6262

6363
echo "Zipping standalone version"
6464
rm -rf *.zip
65-
7z a $NAME-$VERSION.zip $NAME/
65+
7z a $NAME-$VERSION.zip "$NAME/"
6666
echo "Building system wide installer"
6767

68-
$PACKAGE --input "$INPUT_DIR/" \
68+
"$PACKAGE" --input "$INPUT_DIR/" \
6969
--name "$NAME" \
7070
--main-jar "$JAR_NAME" \
7171
--main-class "$MAIN" \

0 commit comments

Comments
 (0)