also adjust jlink to use envsubst

cryptomator · Nov 21, 2024 · 83f08b0 · 83f08b0
1 parent 0571f6f
commit 83f08b0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/build_linux.sh b/build_linux.sh
@@ -31,9 +31,8 @@ cp ./LICENSE.txt ./target/
 mv ./target/cryptomator-cli-*.jar ./target/mods
 
 echo "Creating JRE with jlink..."
-"$JAVA_HOME/bin/jlink" \
-    '@./dist/jlink.args' \
-    --module-path "${JAVA_HOME}/jmods"
+envsubst < dist/jlink.args > target/jlink.args
+"$JAVA_HOME/bin/jlink" '@./target/jlink.args'
 
 if [ $? -ne 0 ] || [ ! -d ./target/runtime ]; then
     echo "JRE creation with jlink failed."

diff --git a/build_mac.sh b/build_mac.sh
@@ -30,9 +30,8 @@ cp ./LICENSE.txt ./target/
 mv ./target/cryptomator-cli-*.jar ./target/mods
 
 echo "Creating JRE with jlink..."
-"$JAVA_HOME/bin/jlink" \
-    '@./dist/jlink.args' \
-    --module-path "${JAVA_HOME}/jmods"
+envsubst < dist/jlink.args > target/jlink.args
+"$JAVA_HOME/bin/jlink" '@./target/jlink.args'
 
 if [ $? -ne 0 ] || [ ! -d ./target/runtime ]; then
     echo "JRE creation with jlink failed."

diff --git a/build_win.ps1 b/build_win.ps1
@@ -26,9 +26,8 @@ Copy-Item ./LICENSE.txt -Destination ./target -ErrorAction Stop
 Move-Item ./target/cryptomator-cli-*.jar ./target/mods -ErrorAction Stop
 
 Write-Host "Creating JRE with jlink..."
-& $env:JAVA_HOME/bin/jlink `
-    `@./dist/jlink.args `
-    --module-path "${env:JAVA_HOME}/jmods"
+Get-Content -Path './dist/jlink.args' | ForEach-Object { $_.Replace('${JAVA_HOME}', "$env:JAVA_HOME")} | Out-File -FilePath './target/jlink.args'
+& $env:JAVA_HOME/bin/jlink `@./target/jlink.args
 
 if ( ($LASTEXITCODE -ne 0) -or (-not (Test-Path ./target/runtime))) {
     throw "JRE creation with jLink failed with exit code $LASTEXITCODE."
@@ -37,9 +36,9 @@ if ( ($LASTEXITCODE -ne 0) -or (-not (Test-Path ./target/runtime))) {
 ## powershell does not have envsubst
 $jpAppVersion='99.9.9'
 Get-Content -Path './dist/jpackage.args' | ForEach-Object {
-    $_.Replace('${APP_VERSION}', $appVersion)
-    .Replace('${JP_APP_VERSION}', $jpAppVersion)
-    .Replace('${NATIVE_ACCESS_PACKAGE}', 'org.cryptomator.jfuse.win')
+    $_.Replace('${APP_VERSION}', $appVersion).
+        Replace('${JP_APP_VERSION}', $jpAppVersion).
+        Replace('${NATIVE_ACCESS_PACKAGE}', 'org.cryptomator.jfuse.win')
 } | Out-File -FilePath './target/jpackage.args'
 
 # jpackage

diff --git a/dist/jlink.args b/dist/jlink.args
@@ -1,4 +1,5 @@
 --verbose
+--module-path "${JAVA_HOME}/jmods"
 --output target/runtime
 --add-modules java.base,java.compiler,java.naming,java.xml
 --strip-native-commands