ref #538: MSI property to allow default PREFIX configuration

torakiki · Oct 27, 2023 · 01a2adb · 01a2adb
1 parent a90a646
commit 01a2adb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pdfsam-basic/src/msi/CA/AddLine/AddLine/CustomAction.cs b/pdfsam-basic/src/msi/CA/AddLine/AddLine/CustomAction.cs
@@ -29,7 +29,13 @@ public static ActionResult AddLine(Session session)
                     File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.compression=" + session.CustomActionData["compression"] + Environment.NewLine);
                     session.Log("Added -Dorg.pdfsam.default.compression=" + session.CustomActionData["compression"]);
                     File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.output.overwrite=" + session.CustomActionData["overwrite"] + Environment.NewLine);
-                    session.Log("Added -Dorg.pdfsam.default.output.overwrite=" + session.CustomActionData["overwrite"]);                      
+                    session.Log("Added -Dorg.pdfsam.default.output.overwrite=" + session.CustomActionData["overwrite"]);
+                    string prefix = session["PREFIX"];
+                    if (!string.IsNullOrEmpty(prefix))
+                    {
+                        File.AppendAllText(path, "java-options=-Dorg.pdfsam.default.prefix=\"" + prefix + "\"" + Environment.NewLine);
+                        session.Log("Added -Dorg.pdfsam.default.prefix=" + prefix);
+                    }
                 }else   
                 {
                     session.Log("Unable to find config file");

diff --git a/pdfsam-basic/src/msi/pdfsam.wxs b/pdfsam-basic/src/msi/pdfsam.wxs
@@ -21,10 +21,11 @@
 		<Property Id="PREMIUM_MODULES" Value="true" Secure="yes"/>
 		<Property Id="PDF_COMPRESSION" Value="true" Secure="yes"/>
 		<Property Id="OVERWRITE_OUTPUT" Value="false" Secure="yes"/>
+		<Property Id="PREFIX" Value="" Secure="yes"/>
 
 	    <Icon Id="pdfsam.ico" SourceFile="$(var.ProductIcon)" />
 		<Binary Id="AddLine.dll" SourceFile="AddLine.CA.dll" />
-		<CustomAction Id="SetCustomActionDataValue" Return="check" Property="CustomActions.AddLine" Value="locale=[LOCALE_CODE];updates=[CHECK_FOR_UPDATES];sounds=[PLAY_SOUNDS];news=[CHECK_FOR_NEWS];premium=[PREMIUM_MODULES];donate=[DONATE_NOTIFICATION];folder=[APPLICATIONFOLDER];compression=[PDF_COMPRESSION];overwrite=[OVERWRITE_OUTPUT]" />
+		<CustomAction Id="SetCustomActionDataValue" Return="check" Property="CustomActions.AddLine" Value="locale=[LOCALE_CODE];updates=[CHECK_FOR_UPDATES];sounds=[PLAY_SOUNDS];news=[CHECK_FOR_NEWS];premium=[PREMIUM_MODULES];donate=[DONATE_NOTIFICATION];folder=[APPLICATIONFOLDER];compression=[PDF_COMPRESSION];overwrite=[OVERWRITE_OUTPUT];prefix=[PREFIX]" />
 		<CustomAction Id="CustomActions.AddLine" Return="check" Execute="deferred" BinaryKey="AddLine.dll" DllEntry="AddLine" Impersonate="no"/>
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of PDFsam Basic is already installed. Setup will now exit." />