Ver código fonte

Double quotes to prevent globbing and word splitting

Toni Helenius 3 semanas atrás
pai
commit
abe283b511
2 arquivos alterados com 17 adições e 17 exclusões
  1. 9 9
      installers/build-installers.sh
  2. 8 8
      installers/download-jdks.sh

+ 9 - 9
installers/build-installers.sh

@@ -46,7 +46,7 @@ function prepare_nbpackage {
 function build_nbpackage {
 function build_nbpackage {
     echo ">> Building the nbpackage installer for $1-$2"
     echo ">> Building the nbpackage installer for $1-$2"
 
 
-    ./nbpackage/nbpackage-$nbpackage_version/bin/nbpackage --input ../dist/jmonkeyplatform.zip --config $1-$2/$3 --output ../dist/ -v -Ppackage.version=$4
+    ./nbpackage/nbpackage-$nbpackage_version/bin/nbpackage --input ../dist/jmonkeyplatform.zip --config "$1-$2/$3" --output ../dist/ -v -Ppackage.version="$4"
 
 
     echo "<< OK!"
     echo "<< OK!"
 }
 }
@@ -55,8 +55,8 @@ function build_nbpackage {
 function build_linux_deb {
 function build_linux_deb {
     echo "> Building the Linux DEB"
     echo "> Building the Linux DEB"
 
 
-    build_nbpackage linux x64 jmonkeyengine-x64-deb.properties $1
-    build_nbpackage linux aarch64 jmonkeyengine-aarch64-deb.properties $1
+    build_nbpackage linux x64 jmonkeyengine-x64-deb.properties "$1"
+    build_nbpackage linux aarch64 jmonkeyengine-aarch64-deb.properties "$1"
 
 
     echo "< OK!"
     echo "< OK!"
 }
 }
@@ -66,7 +66,7 @@ function build_windows_installer {
     
     
     setup_inno_setup $2
     setup_inno_setup $2
     
     
-    build_nbpackage windows x64 jmonkeyengine-windows-x64.properties $1
+    build_nbpackage windows x64 jmonkeyengine-windows-x64.properties "$1"
 
 
     echo "< OK!"
     echo "< OK!"
 }
 }
@@ -106,8 +106,8 @@ function download_inno_setup {
 function build_macos_pgk {
 function build_macos_pgk {
     echo "> Building the MacOS pgk"
     echo "> Building the MacOS pgk"
     
     
-    build_nbpackage macos x64 jmonkeyengine-macos-x64.properties $1
-    build_nbpackage macos aarch64 jmonkeyengine-macos-aarch64.properties $1
+    build_nbpackage macos x64 jmonkeyengine-macos-x64.properties "$1"
+    build_nbpackage macos aarch64 jmonkeyengine-macos-aarch64.properties "$1"
 
 
     echo "< OK!"
     echo "< OK!"
 }
 }
@@ -123,7 +123,7 @@ fi
 
 
 download_nbpackage
 download_nbpackage
 prepare_nbpackage
 prepare_nbpackage
-build_linux_deb $versionString
-build_windows_installer $versionString $2
+build_linux_deb "$versionString"
+build_windows_installer "$versionString" "$2"
 # MACOS needs signed packages etc. So disabled
 # MACOS needs signed packages etc. So disabled
-#build_macos_pgk $versionString
+#build_macos_pgk "$versionString"

+ 8 - 8
installers/download-jdks.sh

@@ -11,11 +11,11 @@ jdk_vendor="eclipse"
 function download_jdk {
 function download_jdk {
     echo ">>> Downloading the JDK for $1_$2$3"
     echo ">>> Downloading the JDK for $1_$2$3"
 
 
-    if [ -f $2-$1/jdk-$1_$2$3 ];
+    if [ -f "$2-$1/jdk-$1_$2$3" ];
     then
     then
         echo "<<< Already existing, SKIPPING."
         echo "<<< Already existing, SKIPPING."
     else
     else
-        curl -# -o $2-$1/jdk-$1_$2$3 -L https://api.adoptium.net/v3/binary/latest/$jdk_major_version/ga/$2/$1/jdk/$jvm_impl/normal/$jdk_vendor?project=jdk
+        curl -# -o "$2-$1/jdk-$1_$2$3" -L "https://api.adoptium.net/v3/binary/latest/$jdk_major_version/ga/$2/$1/jdk/$jvm_impl/normal/$jdk_vendor?project=jdk"
         echo "<<< OK!"
         echo "<<< OK!"
     fi
     fi
 }
 }
@@ -55,12 +55,12 @@ function get_jdk {
     fi
     fi
 
 
     # Depends on UNPACK and thus DOWNLOAD
     # Depends on UNPACK and thus DOWNLOAD
-    if [ $1 == "windows" ]; then
-        get_jdk_windows $2
-    elif [ $1 == "linux" ]; then
-        get_jdk_linux $2
-    elif [ $1 == "macos" ]; then
-        get_jdk_macos $2
+    if [ "$1" == "windows" ]; then
+        get_jdk_windows "$2"
+    elif [ "$1" == "linux" ]; then
+        get_jdk_linux "$2"
+    elif [ "$1" == "macos" ]; then
+        get_jdk_macos "$2"
     fi
     fi
 
 
     echo "< OK!"
     echo "< OK!"