mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-28 02:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Several fixes:

Browse Source 
* substitute all java-options
* use correct properties path
* fix read-only attribute of debug launcher
This commit is contained in:
Armin Schrenk
2023-02-06 13:55:40 +01:00
parent 9f035b7d37
commit 641066ea07
4 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/win/.gitignore
+1 -1
View File
@@ -5,4 +5,4 @@ installer
*.pdb
*.msi
license.rtf
debug.properties
*Debug.properties
dist/win/build.ps1
Vendored
+7 -3
View File
@@ -67,7 +67,10 @@ if ($clean -and (Test-Path -Path $appPath)) {
$debugProps = Get-Content -Path $buildDir\resources\debug-launcher.properties
$debugProps = $debugProps -replace '\${SEM_VER_STR}', "$semVerNo"
$debugProps = $debugProps -replace '\${REVISION_NUM}', "$revisionNo"
Set-Content -Path $buildDir\resources\debug.properties -Value $debugProps
$debugProps = $debugProps -replace '\${APP_NAME}', "$AppName"
$debugProps = $debugProps -replace '\${LOOPBACK_ALIAS}', "$LoopbackAlias"
Set-Content -Path $buildDir\resources\${AppName}Debug.properties -Value $debugProps
# create app dir
& "$Env:JAVA_HOME\bin\jpackage" `
@@ -99,9 +102,9 @@ Set-Content -Path $buildDir\resources\debug.properties -Value $debugProps
--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"~/AppData/Roaming/$AppName/keychain.json`"" `
--java-options "-Dcryptomator.showTrayIcon=true" `
--java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" `
--add-launcher debug=$buildDir\resources\debug.properties `
--resource-dir resources `
--icon resources/$AppName.ico
--icon resources/$AppName.ico `
--add-launcher "${AppName}Debug=$buildDir\resources\${AppName}Debug.properties"
#Create RTF license for msi
&mvn -B -f $buildDir/../../pom.xml license:add-third-party `
@@ -116,6 +119,7 @@ Set-Content -Path $buildDir\resources\debug.properties -Value $debugProps
# patch app dir
Copy-Item "contrib\*" -Destination "$AppName"
attrib -r "$AppName\$AppName.exe"
attrib -r "$AppName\${AppName}Debug.exe"
# patch batch script to set hostfile
$webDAVPatcher = "$AppName\patchWebDAV.bat"
try {
dist/win/resources/debug-launcher.properties
Vendored
+9 -9
View File
@@ -5,14 +5,14 @@ java-options=--enable-preview \
-Xmx256m \
-Dcryptomator.appVersion="${SEM_VER_STR}" \
-Dfile.encoding="utf-8" \
-Dcryptomator.logDir="~/AppData/Roaming/$AppName" \
-Dcryptomator.pluginDir="~/AppData/Roaming/$AppName/Plugins" \
-Dcryptomator.settingsPath="~/AppData/Roaming/$AppName/settings.json" \
-Dcryptomator.ipcSocketPath="~/AppData/Roaming/$AppName/ipc.socket" \
-Dcryptomator.p12Path="~/AppData/Roaming/$AppName/key.p12" \
-Dcryptomator.mountPointsDir="~/$AppName" \
-Dcryptomator.loopbackAlias="$LoopbackAlias" \
-Dcryptomator.integrationsWin.autoStartShellLinkName="$AppName" \
-Dcryptomator.integrationsWin.keychainPaths="~/AppData/Roaming/$AppName/keychain.json" \
-Dcryptomator.logDir="~/AppData/Roaming/${APP_NAME}" \
-Dcryptomator.pluginDir="~/AppData/Roaming/${APP_NAME}/Plugins" \
-Dcryptomator.settingsPath="~/AppData/Roaming/${APP_NAME}/settings.json" \
-Dcryptomator.ipcSocketPath="~/AppData/Roaming/${APP_NAME}/ipc.socket" \
-Dcryptomator.p12Path="~/AppData/Roaming/${APP_NAME}/key.p12" \
-Dcryptomator.mountPointsDir="~/${APP_NAME}" \
-Dcryptomator.loopbackAlias="${LOOPBACK_ALIAS}" \
-Dcryptomator.integrationsWin.autoStartShellLinkName="${APP_NAME}" \
-Dcryptomator.integrationsWin.keychainPaths="~/AppData/Roaming/${APP_NAME}/keychain.json" \
-Dcryptomator.showTrayIcon=true \
-Dcryptomator.buildNumber="msi-${REVISION_NUM}"