fixing bug 85876 - langenus.xpi does not install properly when smartupdating. r=sgehani, sr=mscott, a=drivers@mozilla.org not part of any tinderbox builds.

This commit is contained in:
ssu%netscape.com 2001-06-22 05:31:10 +00:00
parent a3d1d28f36
commit f5f2872199
8 changed files with 44 additions and 35 deletions

View File

@ -53,3 +53,40 @@ function deleteThisFolder(dirKey, folder)
return(false);
}
// OS type detection
// which platform?
function getPlatform()
{
var platformStr;
var platformNode;
if('platform' in Install)
{
platformStr = new String(Install.platform);
if (!platformStr.search(/^Macintosh/))
platformNode = 'mac';
else if (!platformStr.search(/^Win/))
platformNode = 'win';
else
platformNode = 'unix';
}
else
{
var fOSMac = getFolder("Mac System");
var fOSWin = getFolder("Win System");
logComment("fOSMac: " + fOSMac);
logComment("fOSWin: " + fOSWin);
if(fOSMac != null)
platformNode = 'mac';
else if(fOSWin != null)
platformNode = 'win';
else
platformNode = 'unix';
}
return platformNode;
}

View File

@ -2,7 +2,6 @@ function upgradeCleanup()
{
// Obsolete files from Netscape 6.0 and Netscape 6.01 that
// need to be cleaned up.
deleteThisFile("Components", "browser.xpt");
deleteThisFile("Components", "DOMDataSource.shlb");
deleteThisFile("Components", "PSMGlue.shlb");
deleteThisFile("Components", "ucth.shlb");

View File

@ -2,18 +2,9 @@ var srDest = $SpaceRequired$;
var err;
var fProgram;
// OS type detection
// which platform?
var platformStr = new String(Install.platform);
var platformNode;
if (!platformStr.search(/^Macintosh/))
platformNode = 'mac';
else if (!platformStr.search(/^Win/))
platformNode = 'win';
else
platformNode = 'unix';
platformNode = getPlatform();
logComment("initInstall: platformNode=" + platformNode);
// end
// end - OS type detection

View File

@ -2,7 +2,6 @@ function upgradeCleanup()
{
// Obsolete files from Netscape 6.0 and Netscape 6.01 that
// need to be cleaned up.
deleteThisFile("Components", "mail.xpt");
deleteThisFile("Components", "signed.shlb");
}

View File

@ -1,18 +1,9 @@
var srDest = $SpaceRequired$;
var err;
var fProgram;
// OS type detection
// which platform?
var platformStr = new String(Install.platform);
var platformNode;
if (!platformStr.search(/^Macintosh/))
platformNode = 'mac';
else if (!platformStr.search(/^Win/))
platformNode = 'win';
else
platformNode = 'unix';
platformNode = getPlatform();
logComment("initInstall: platformNode=" + platformNode);
// end
// end - OS type detection

View File

@ -2,18 +2,9 @@
var srDest;
var err;
var fProgram;
// OS type detection
// which platform?
var platformStr = new String(Install.platform);
var platformNode;
if (!platformStr.search(/^Macintosh/))
platformNode = 'mac';
else if (!platformStr.search(/^Win/))
platformNode = 'win';
else
platformNode = 'unix';
platformNode = getPlatform();
logComment("initInstall: platformNode=" + platformNode);
// end
// end - OS type detection

View File

@ -66,9 +66,9 @@ $seiFileNameSpecificStub = "mozilla-win32-stub-installer.exe";
$seuFileNameSpecific = "MozillaUninstall.exe";
# set environment vars for use by other .pl scripts called from this script.
$ENV{WIZ_userAgent} = "0.9.1 (en)"; # ie: "0.9 (en)"
$ENV{WIZ_userAgentShort} = "0.9.1"; # ie: "0.9"
$ENV{WIZ_xpinstallVersion} = "0.9.1"; # ie: "0.9.0"
$ENV{WIZ_userAgent} = "0.9.2 (en)"; # ie: "0.9 (en)"
$ENV{WIZ_userAgentShort} = "0.9.2"; # ie: "0.9"
$ENV{WIZ_xpinstallVersion} = "0.9.2"; # ie: "0.9.0"
$ENV{WIZ_nameCompany} = "mozilla.org";
$ENV{WIZ_nameProduct} = "Mozilla";
$ENV{WIZ_fileMainExe} = "Mozilla.exe";

View File

@ -2,6 +2,7 @@ function upgradeCleanup()
{
// Obsolete files from Netscape 6.0 and Netscape 6.01 that
// need to be cleaned up.
deleteThisFile("Program", "psm.exe");
deleteThisFile("Components", "psmglue.dll");
}