diff --git a/xpinstall/packager/mac/browser.jst b/xpinstall/packager/mac/browser.jst index d0ce68443e07..aee3ea63db2a 100644 --- a/xpinstall/packager/mac/browser.jst +++ b/xpinstall/packager/mac/browser.jst @@ -1,27 +1,38 @@ -var err = StartInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); -LogComment("StartInstall: " + err); +var err = startInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); +logComment("startInstall: " + err); -var communicatorFolder = GetFolder("Communicator"); -LogComment("communicatorFolder: " + communicatorFolder); +var communicatorFolder = getFolder("Communicator"); +logComment("communicatorFolder: " + communicatorFolder); -err = AddDirectory("Program", +var subFolder = "Mozilla Folder"; +err = addDirectory("Program", "$Version$", "viewer", // jar source folder communicatorFolder, // target folder - "Mozilla Folder", // target subdir + subFolder, // target subdir false); // force flag -LogComment("AddDirectory() returned: " + err); +logComment("addDirectory() returned: " + err); + +// create the plugins folder next to mozilla +var pluginsFolder = getFolder("Plugins"); +var ignoreErr = dirCreate(pluginsFolder); +logComment("dirCreate() returned: " + ignoreErr); + +// make an alias to the browser on the desktop +var desktopFolder = getFolder("Mac Desktop"); +var appFolder = getFolder("Communicator", subFolder); +ignoreErr = fileMacAlias(appFolder, "apprunner", // source + desktopFolder, "Mozilla"); // target +logComment("fileMacAlias() returned: " + ignoreErr); -err = GetLastError(); if (err==SUCCESS || err==REBOOT_NEEDED) { - err = FinalizeInstall(); - LogComment("FinalizeInstall() returned: " + err); + err = finalizeInstall(); + logComment("finalizeInstall() returned: " + err); } else { - err = AbortInstall(); - LogComment("AbortInstall() returned: " + err); + abortInstall(); + logComment("abortInstall() due to error: " + err); } - diff --git a/xpinstall/packager/mac/editor.jst b/xpinstall/packager/mac/editor.jst index 83113f152c6c..0343b2b79fd0 100644 --- a/xpinstall/packager/mac/editor.jst +++ b/xpinstall/packager/mac/editor.jst @@ -1,28 +1,28 @@ -var err = StartInstall("Mozilla Editor", "Seamonkey", "$Version$"); -LogComment("StartInstall: " + err); +var err = startInstall("Mozilla Editor", "Seamonkey", "$Version$"); +logComment("startInstall: " + err); -var communicatorFolder = GetFolder("Communicator"); -LogComment("communicatorFolder: " + communicatorFolder); +var communicatorFolder = getFolder("Communicator"); +logComment("communicatorFolder: " + communicatorFolder); -err = AddDirectory("Program", +err = addDirectory("Program", "$Version$", "bin", // jar source folder communicatorFolder, // target folder "", // target subdir false); // force Flag -LogComment("AddDirectory() returned: " + err); +logComment("addDirectory() returned: " + err); -err = GetLastError(); +err = getLastError(); if (err==SUCCESS || err==REBOOT_NEEDED) { - err = FinalizeInstall(); - LogComment("FinalizeInstall() returned: " + err); + err = finalizeInstall(); + logComment("finalizeInstall() returned: " + err); } else { - err = AbortInstall(); - LogComment("AbortInstall() returned: " + err); + abortInstall(); + logComment("abortInstall() due to error: " + err); } diff --git a/xpinstall/packager/mac/install.jst b/xpinstall/packager/mac/install.jst index 3d2080ad58c8..06848cc3a654 100644 --- a/xpinstall/packager/mac/install.jst +++ b/xpinstall/packager/mac/install.jst @@ -1,27 +1,31 @@ -var err = StartInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); -LogComment("StartInstall: " + err); +var err = startInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); +logComment("startInstall: " + err); -var communicatorFolder = GetFolder("Communicator"); -LogComment("communicatorFolder: " + communicatorFolder); +var communicatorFolder = getFolder("Communicator"); +logComment("communicatorFolder: " + communicatorFolder); -err = AddDirectory("Program", +var subFolder = "Mozilla Folder"; + +err = addDirectory("Program", "$Version$", "viewer", // jar source folder communicatorFolder, // target folder - "Mozilla Folder", // target subdir + subFolder, // target subdir false); // force flag -LogComment("AddDirectory() returned: " + err); +logComment("addDirectory() returned: " + err); -FileDelete(communicatorFolder+":Component Registry"); // we don't care if this fails +// delete the component registry +var ignoreErr = fileDelete(communicatorFolder + subFolder + ":Component Registry"); +logComment("fileDelete() returned: " + ignoreErr); if (err==SUCCESS || err==REBOOT_NEEDED) { - err = FinalizeInstall(); - LogComment("FinalizeInstall() returned: " + err); + err = finalizeInstall(); + logComment("finalizeInstall() returned: " + err); } else { - err = AbortInstall(); - LogComment("AbortInstall() returned: " + err); + abortInstall(); + logComment("abortInstall() returned: " + err); } \ No newline at end of file diff --git a/xpinstall/packager/mac/mail.jst b/xpinstall/packager/mac/mail.jst index dbf499b27467..74e0aee6f329 100644 --- a/xpinstall/packager/mac/mail.jst +++ b/xpinstall/packager/mac/mail.jst @@ -1,27 +1,27 @@ -var err = StartInstall("Mozilla Mail", "Seamonkey", "$Version$"); -LogComment("StartInstall: " + err); +var err = startInstall("Mozilla Mail", "Seamonkey", "$Version$"); +logComment("startInstall: " + err); -var communicatorFolder = GetFolder("Communicator"); -LogComment("communicatorFolder: " + communicatorFolder); +var communicatorFolder = getFolder("Communicator"); +logComment("communicatorFolder: " + communicatorFolder); -err = AddDirectory("Program", +err = addDirectory("Program", "$Version$", "viewer", // jar source folder communicatorFolder, // target folder "Mozilla Folder", // target subdir false); // force flag -LogComment("AddDirectory() returned: " + err); +logComment("addDirectory() returned: " + err); -err = GetLastError(); +err = getLastError(); if (err==SUCCESS || err==REBOOT_NEEDED) { - err = FinalizeInstall(); - LogComment("FinalizeInstall() returned: " + err); + err = finalizeInstall(); + logComment("finalizeInstall() returned: " + err); } else { - err = AbortInstall(); - LogComment("AbortInstall() returned: " + err); + abortInstall(); + logComment("abortInstall() due to error: " + err); }