diff --git a/installer/config/config.xml b/installer/config/config.xml index ef09646..aebb04e 100644 --- a/installer/config/config.xml +++ b/installer/config/config.xml @@ -5,5 +5,5 @@ PA Calculator Installer DKM-Tech DKM-Tech - @ApplicationsDirX64@\PA Calculator + @ApplicationsDir@/PA Calculator diff --git a/installer/packages/com.dkmtech.libraryfile/meta/installscript.qs b/installer/packages/com.dkmtech.libraryfile/meta/installscript.qs index bca06b9..43f76a6 100644 --- a/installer/packages/com.dkmtech.libraryfile/meta/installscript.qs +++ b/installer/packages/com.dkmtech.libraryfile/meta/installscript.qs @@ -7,15 +7,17 @@ Component.prototype.createOperations = function() try { // call the base create operations function component.createOperations(); - try { + if (installer.value("os") == "win") { var userProfile = installer.environmentVariable("USERPROFILE"); installer.setValue("UserProfile", userProfile); - component.addOperation("Copy", "@TargetDir@/Technik-AG.palib", "@UserProfile@\\Documents\\Technik-AG.palib"); - component.addOperation("GlobalConfig", "DKM-Tech", "PA-Calculator", "library/path", "@UserProfile@\\Documents\\Technik-AG.palib"); - - } catch (e) { - // Do nothing if key doesn't exist - } + component.addOperation("Copy", "@TargetDir@\\Technik-AG.palib", "@UserProfile@\\Documents\\Technik-AG.palib"); + component.addOperation("GlobalConfig", "DKM-Tech", "PA-Calculator", "library/path", "@UserProfile@\\Documents\\Technik-AG.palib"); + }else if (nstaller.value("os") == "mac"){ + var userProfile = installer.environmentVariable("USERPROFILE"); + installer.setValue("UserProfile", userProfile); + component.addOperation("Copy", "@TargetDir@/Technik-AG.palib", "@UserProfile@/Documents/Technik-AG.palib"); + component.addOperation("GlobalConfig", "DKM-Tech", "PA-Calculator", "library/path", "@UserProfile@/Documents/Technik-AG.palib"); + } } catch (e) { print(e); } diff --git a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs index 7e55b36..cf90d4f 100644 --- a/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs +++ b/installer/packages/com.dkmtech.pacalculator/meta/installscript.qs @@ -12,7 +12,7 @@ Component.prototype.createOperations = function() var userProfile = installer.environmentVariable("USERPROFILE"); installer.setValue("UserProfile", userProfile); component.addOperation("CreateShortcut", "@TargetDir@\\PA_Calculator.exe", "@UserProfile@\\Desktop\\PA Calculator.lnk"); - component.addOperation("CreateShortcut", "@TargetDir@/PA_Calculator.exe", "@StartMenuDir@/PA_Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator"); + component.addOperation("CreateShortcut", "@TargetDir@/PA_Calculator.exe", "@StartMenuDir@/PA_Calculator.lnk","workingDirectory=@TargetDir@","description=Start PA-Calculator"); } catch (e) { // Do nothing if key doesn't exist } diff --git a/installer/packages/com.dkmtech.pacalculator/meta/package.xml b/installer/packages/com.dkmtech.pacalculator/meta/package.xml index 80544fa..f956e3d 100644 --- a/installer/packages/com.dkmtech.pacalculator/meta/package.xml +++ b/installer/packages/com.dkmtech.pacalculator/meta/package.xml @@ -2,7 +2,7 @@ PA-Calculator Install PA-Calculator - 0.2 + 1.0 2021-11-07