Add support for PortableFirefox

Adds a 4th param to windows-keygen.js to take the PortableFirefox install location.
qzind · Nov 4, 2015 · 93838ed · 93838ed
1 parent c718925
commit 93838ed
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/ant/windows/windows-keygen.js.in b/ant/windows/windows-keygen.js.in
@@ -26,8 +26,11 @@
  *    keytool.exe (distributed with jre: http://java.com)                                     *
  *                                                                                            *
  *  Usage:                                                                                    *
- *    cscript //NoLogo ${windows.keygen.name} "C:\Program Files\QZ Tray" install [hostname]        *
- *    cscript //NoLogo ${windows.keygen.name} "C:\Program Files\QZ Tray" uninstall [hostname]      *
+ *    cscript //NoLogo ${windows.keygen.name}                                                      *
+ *            "C:\Program Files\QZ Tray" install [hostname] [portable_firefox]                *
+ *                                                                                            *
+ *    cscript //NoLogo ${windows.keygen.name}                                                 *
+ *            "C:\Program Files\QZ Tray" uninstall [hostname] [portable_firefox]                   *
  *                                                                                            *
  **********************************************************************************************/
 
@@ -39,6 +42,7 @@ var newLine = "\r\n";
 var qzInstall = getArg(0, getRegValue("HKLM\\Software\\${socket.name}\\"));
 var installMode = getArg(1, "install");
 var cn = getArg(2, "${jks.cn}");
+var firefoxPortable = getArg(3, null);
 
 if (installMode == "install") {
     var javaKey, jreHome, keyTool, keyStore, password, derCert, firefoxInstall;
@@ -285,6 +289,12 @@ function installWindowsXPCertificate() {
  * Gets the Firefox installation path, stores it a global variable "firefoxInstall"
  */
 function getFirefoxInstall() {
+    //  Use provided install directory, if supplied
+    if (firefoxPortable) {
+        firefoxInstall = firefoxPortable + "\\App\\Firefox\\firefox.exe";
+        return firefoxInstall;
+    }
+
     //  Determine if Firefox is installed
     var firefoxKey = "HKLM\\Software\\Mozilla\\Mozilla Firefox";
     var firefoxVer = getRegValue(firefoxKey + "\\");