Add disk space checking. [nsbeta3+ b=29845; r=ssu,dbragg]

xpinstall/packager/mac/browser.jst

@@ -1,46 +1,46 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Seamonkey", "Browser", "$Version$"); 
 logComment("initInstall: " + err);
 
 var fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("Program",
-                   "$Version$",
-                   "viewer",           // jar source folder
-                   fProgram,           // target folder 
-                   "",                 // target subdir 
-                   true );             // force flag 
-
-logComment("addDirectory() returned: " + err);
-
-// create the plugins folder next to mozilla 
-// var pluginsParentFolder = getFolder(communicatorFolder, subFolder);
-// var pluginsFolder = getFolder(pluginsParentFolder, "Plugins");
-// ignoreErr = dirCreate(pluginsFolder);
-// logComment("dirCreate() returned: " + ignoreErr);
-
-var ctype = (CONTENT | DELAYED_CHROME);
-var cf = getFolder(fProgram,"chrome");
-registerChrome(ctype, getFolder(cf,"packages/core"));
-registerChrome(ctype, getFolder(cf,"packages/widget-toolkit"));
-registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/modern"));
-registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/classic"));
-registerChrome(LOCALE|DELAYED_CHROME, getFolder(cf,"locales/en-US"));
-err = getLastError();
-
-// make an alias to the browser on the desktop 
-var desktopFolder = getFolder("Mac Desktop");
-var ignoreErr = fileMacAlias(fProgram,      "Mozilla",   // source
-                             desktopFolder, "Mozilla");  // target
-logComment("fileMacAlias() returned: " + ignoreErr);
-
-if (err==SUCCESS)
+if (verifyDiskSpace(fProgram, srDest))
 {
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    err = addDirectory("Program",
+                       "$Version$",
+                       "viewer",           // jar source folder
+                       fProgram,           // target folder 
+                       "",                 // target subdir 
+                       true );             // force flag 
+
+    logComment("addDirectory() returned: " + err);
+
+    var ctype = (CONTENT | DELAYED_CHROME);
+    var cf = getFolder(fProgram,"chrome");
+    registerChrome(ctype, getFolder(cf,"packages/core"));
+    registerChrome(ctype, getFolder(cf,"packages/widget-toolkit"));
+    registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/modern"));
+    registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/classic"));
+    registerChrome(LOCALE|DELAYED_CHROME, getFolder(cf,"locales/en-US"));
+
+    // make an alias to the browser on the desktop 
+    var desktopFolder = getFolder("Mac Desktop");
+    var ignoreErr = fileMacAlias(fProgram,      "Mozilla",   // source
+                             desktopFolder, "Mozilla");  // target
+    logComment("fileMacAlias() returned: " + ignoreErr);
+
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+    	logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() due to error: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/chatzilla.jst

@@ -1,28 +1,29 @@
-// NOTE: due to a bug Mac wizard install folders are off by one, so
-// different scripts would be needed for an initial install vs.
-// a later XPInstall.  This script is being written for an initial
-// install; for a web install use the Windows or Unix installs
+var srDest = $SpaceRequired$;
 
 var err = initInstall("Chatzilla v0.5", "Chatzilla", "$Version$"); 
 logComment("initInstall: " + err);
 
 var fProgram = getFolder("Program");
-addFile("Chatzilla service",
+
+if (verifyDiskSpace(fProgram, srDest))
+{
+    addFile("Chatzilla service",
         "viewer/Components/chatzilla-service.js",
         getFolder(fProgram,"Components"),
         "");
 
-var fChat = getFolder(fProgram,"chrome/`packages/chatzilla");
-addDirectory("",
+    var fChat = getFolder(fProgram,"chrome/packages/chatzilla");
+    addDirectory("",
              "viewer/chrome/packages/chatzilla", // jar source folder 
              fChat,                           // target folder
              "");                             // target subdir 
 
-registerChrome(PACKAGE | DELAYED_CHROME, fChat);
+    registerChrome(PACKAGE | DELAYED_CHROME, fChat);
 
-err = getLastError();
-if (err==SUCCESS)
-    performInstall(); 
+    if (err==SUCCESS)
+        performInstall(); 
+    else
+        cancelInstall(err);
+}
 else
-    cancelInstall(err);
-
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/deflenus.jst

@@ -1,3 +1,5 @@
+var srDest = $SpaceRequired$;
+
 var err;
 var fProgram;
 
@@ -12,22 +14,26 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("",
                    "$Version$",
                    "viewer",
                    fProgram,
                    "",
                    true);
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-// check return value
-if(err == SUCCESS)
-{
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    if (err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/editor.jst

@@ -1,28 +1,33 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Editor", "Editor", "$Version$"); 
 logComment("initInstall: " + err);
 
 var fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("Program",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("Program",
                    "$Version$",
                    "bin",              // jar source folder
                    fProgram,           // target folder 
                    "",                 // target subdir 
                    true );             // force Flag 
 
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-err = getLastError();
-if (err==SUCCESS || err==REBOOT_NEEDED)
-{
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    err = getLastError();
+    if (err==SUCCESS || err==REBOOT_NEEDED)
+    {
+	    err = performInstall(); 
+    	logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+     	logComment("cancelInstall() due to error: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() due to error: " + err);
-}
-
-
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/langende.jst

@@ -1,3 +1,5 @@
+var srDest = $SpaceRequired$;
+
 var err;
 var fProgram;
 
@@ -13,26 +15,29 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("",
                    "$Version$",
                    "viewer",
                    fProgram,
                    "",
                    true);
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-// register chrome
-var cf = getFolder("Chrome");
-registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+    var cf = getFolder("Chrome");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
 
-// check return value
-if(err == SUCCESS)
-{
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    if(err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/langengb.jst

@@ -1,3 +1,5 @@
+var srDest = $SpaceRequired$;
+
 var err;
 var fProgram;
 
@@ -13,26 +15,29 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("",
                    "$Version$",
                    "viewer",
                    fProgram,
                    "",
                    true);
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-// register chrome
-var cf = getFolder("Chrome");
-registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+    var cf = getFolder("Chrome");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
 
-// check return value
-if(err == SUCCESS)
-{
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    if(err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/langenus.jst

@@ -1,3 +1,5 @@
+var srDest = $SpaceRequired$;
+
 var err;
 var fProgram;
 
@@ -13,26 +15,29 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("",
                    "$Version$",
                    "viewer",
                    fProgram,
                    "",
                    true);
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-// register chrome
-var cf = getFolder("Chrome");
-registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+    var cf = getFolder("Chrome");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
 
-// check return value
-if(err == SUCCESS)
-{
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    if(err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/mail.jst

@@ -1,31 +1,36 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Mail", "Mail", "$Version$"); 
 logComment("initInstall: " + err);
 
 var fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("Program",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("Program",
                    "$Version$",
                    "viewer",           // jar source folder 
                    fProgram,           // target folder
                    "",                 // target subdir 
                    true );             // force flag 
 
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-err = registerChrome(CONTENT | DELAYED_CHROME,
+    err = registerChrome(CONTENT | DELAYED_CHROME,
                      getFolder(fProgram,"chrome/packages/messenger"));
-logComment("registerChrome() returned: " + err);
+    logComment("registerChrome() returned: " + err);
 
-err = getLastError();
-if (err==SUCCESS)
-{
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+    	logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+    	logComment("cancelInstall() due to error: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() due to error: " + err);
-}
-
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/mac/xpcom.jst

@@ -1,3 +1,5 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Seamonkey", "Browser", "$Version$"); 
 logComment("initInstall: " + err);
 
@@ -6,22 +8,27 @@ logComment("fProgram: " + fProgram);
 
 var subFolder = "Mozilla Folder";
 
-err = addDirectory("Program",
+if (verifyDiskSpace(fProgram, srDest))
+{
+    err = addDirectory("Program",
                    "$Version$",
                    "viewer",           // jar source folder 
                    fProgram,           // target folder 
                    "",                 // target subdir 
                    true );             // force flag 
 
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-if (err==SUCCESS)
-{
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+    	logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() returned: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() returned: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/browser.jst

@@ -1,37 +1,44 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Program");
 logComment("communicatorFolder: " + communicatorFolder);
 
-err = addDirectory("Program",
-                   "$Version$",
-                   "bin",              // jar source folder
-                   communicatorFolder, // target folder
-                   "",                 // target subdir 
-                   true );             // force flag 
-
-logComment("addDirectory() returned: " + err);
-
-// create the plugins folder next to mozilla 
-var pluginsFolder = getFolder("Plugins");
-var ignoreErr = dirCreate(pluginsFolder);
-logComment("dirCreate() returned: " + ignoreErr);
-
-var ctype = (CONTENT | DELAYED_CHROME);
-var cf = getFolder("Chrome");
-registerChrome(ctype, getFolder(cf,"packages/core"));
-registerChrome(ctype, getFolder(cf,"packages/widget-toolkit"));
-registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/modern"));
-registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/classic"));
-
-if (err==SUCCESS)
+if (verifyDiskSpace(communicatorFolder, srDest))
 {
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    err = addDirectory("Program",
+                       "$Version$",
+                       "bin",              // jar source folder
+                       communicatorFolder, // target folder
+                       "",                 // target subdir 
+                       true );             // force flag 
+
+    logComment("addDirectory() returned: " + err);
+
+    // create the plugins folder next to mozilla 
+    var pluginsFolder = getFolder("Plugins");
+    var ignoreErr = dirCreate(pluginsFolder);
+    logComment("dirCreate() returned: " + ignoreErr);
+
+    var ctype = (CONTENT | DELAYED_CHROME);
+    var cf = getFolder("Chrome");
+    registerChrome(ctype, getFolder(cf,"packages/core"));
+    registerChrome(ctype, getFolder(cf,"packages/widget-toolkit"));
+    registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/modern"));
+    registerChrome(SKIN|DELAYED_CHROME, getFolder(cf,"skins/classic"));
+
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+	    logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() due to error: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/chatzilla.jst

@@ -1,22 +1,29 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Chatzilla v0.5", "Chatzilla", "$Version$"); 
 logComment("initInstall: " + err);
 
-addFile("Chatzilla service",
-        "bin/components/chatzilla-service.js",
-        getFolder("Components"),
-        "");
+if (verifyDiskSpace(getFolder("Program"), srDest))
+{
+    addFile("Chatzilla service",
+            "$Version$",
+            "bin/components/chatzilla-service.js",
+            getFolder("Components"),
+            "chatzilla-service.js",
+            true);
 
-var fChat = getFolder("Chrome","packages/chatzilla");
-addDirectory("",
-             "bin/chrome/packages/chatzilla", // jar source folder 
-             fChat,                           // target folder
-             "");                             // target subdir 
+    var fChat = getFolder("Chrome","packages/chatzilla");
+    addDirectory("",
+                 "bin/chrome/packages/chatzilla", // jar source folder 
+                 fChat,                           // target folder
+                 "");                             // target subdir 
 
-registerChrome(PACKAGE | DELAYED_CHROME, fChat);
+    registerChrome(PACKAGE | DELAYED_CHROME, fChat);
 
-err = getLastError();
-if (err==SUCCESS)
-    performInstall(); 
+    if (err==SUCCESS)
+        performInstall(); 
+    else
+        cancelInstall(err);
+}
 else
-    cancelInstall(err);
-
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/deflenus.jst

@@ -1,3 +1,4 @@
+var srDest = $SpaceRequired$;
 var err;
 var fProgram;
 
@@ -12,22 +13,26 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
-                   "$Version$",
-                   "bin",
-                   fProgram,
-                   "",
-                   true);
-logComment("addDirectory() returned: " + err);
-
-// check return value
-if(err == SUCCESS)
+if (verifyDiskSpace(fProgram, srDest))
 {
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    err = addDirectory("",
+                       "$Version$",
+                       "bin",
+                       fProgram,
+                       "",
+                       true);
+    logComment("addDirectory() returned: " + err);
+
+    if (err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/editor.jst

@@ -1,28 +1,33 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Editor", "Seamonkey", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Program");
 logComment("communicatorFolder: " + communicatorFolder);
 
-err = addDirectory("Program",
-                   "$Version$",
-                   "bin",              // jar source folder
-                   communicatorFolder, // target folder 
-                   "",                 // target subdir 
-                   true );             // force Flag 
-
-logComment("addDirectory() returned: " + err);
-
-err = getLastError();
-if (err==SUCCESS)
+if (verifyDiskSpace(communicatorFolder, srDest))
 {
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    err = addDirectory("Program",
+                       "$Version$",
+                       "bin",              // jar source folder
+                       communicatorFolder, // target folder 
+                       "",                 // target subdir 
+                       true );             // force Flag 
+
+    logComment("addDirectory() returned: " + err);
+
+    err = getLastError();
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+	    logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() due to error: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() due to error: " + err);
-}
-
-
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/langende.jst

@@ -1,3 +1,4 @@
+var srDest = $SpaceRequired$;
 var err;
 var fProgram;
 
@@ -13,26 +14,30 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
-                   "$Version$",
-                   "bin",
-                   fProgram,
-                   "",
-                   true);
-logComment("addDirectory() returned: " + err);
-
-// register chrome
-var cf = getFolder("Chrome");
-registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
-
-// check return value
-if(err == SUCCESS)
+if (verifyDiskSpace(fProgram, srDest))
 {
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    err = addDirectory("",
+                       "$Version$",
+                       "bin",
+                       fProgram,
+                       "",
+                       true);
+    logComment("addDirectory() returned: " + err);
+
+    // register chrome
+    var cf = getFolder("Chrome");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+
+    if (err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/langengb.jst

@@ -1,3 +1,4 @@
+var srDest = $SpaceRequired$;
 var err;
 var fProgram;
 
@@ -13,26 +14,30 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
-                   "$Version$",
-                   "bin",
-                   fProgram,
-                   "",
-                   true);
-logComment("addDirectory() returned: " + err);
-
-// register chrome
-var cf = getFolder("Chrome");
-registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
-
-// check return value
-if(err == SUCCESS)
+if (verifyDiskSpace(fProgram, srDest))
 {
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    err = addDirectory("",
+                       "$Version$",
+                       "bin",
+                       fProgram,
+                       "",
+                       true);
+    logComment("addDirectory() returned: " + err);
+
+    // register chrome
+    var cf = getFolder("Chrome");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+
+    if (err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/langenus.jst

@@ -1,3 +1,4 @@
+var srDest = $SpaceRequired$;
 var err;
 var fProgram;
 
@@ -13,26 +14,30 @@ logComment("initInstall: " + err);
 fProgram = getFolder("Program");
 logComment("fProgram: " + fProgram);
 
-err = addDirectory("",
-                   "$Version$",
-                   "bin",
-                   fProgram,
-                   "",
-                   true);
-logComment("addDirectory() returned: " + err);
-
-// register chrome
-var cf = getFolder("Chrome");
-registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
-
-// check return value
-if(err == SUCCESS)
+if (verifyDiskSpace(fProgram, srDest))
 {
-    err = performInstall(); 
-    logComment("performInstall() returned: " + err);
+    err = addDirectory("",
+                       "$Version$",
+                       "bin",
+                       fProgram,
+                       "",
+                       true);
+    logComment("addDirectory() returned: " + err);
+
+    // register chrome
+    var cf = getFolder("Chrome");
+    registerChrome(LOCALE | DELAYED_CHROME, getFolder(cf, chromeName));
+
+    if (err == SUCCESS)
+    {
+        err = performInstall(); 
+        logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+        cancelInstall(err);
+        logComment("cancelInstall due to error: " + err);
+    }
 }
 else
-{
-    cancelInstall(err);
-    logComment("cancelInstall due to error: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/mail.jst

@@ -1,30 +1,35 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Mail", "Seamonkey", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Program");
 logComment("communicatorFolder: " + communicatorFolder);
 
-err = addDirectory("Program",
-                   "$Version$",
-                   "bin",              // jar source folder 
-                   communicatorFolder, // target folder
-                   "",                 // target subdir 
-                   true );             // force flag 
+if (verifyDiskSpace(communicatorFolder, srDest))
+{
+    err = addDirectory("Program",
+                       "$Version$",
+                       "bin",              // jar source folder 
+                       communicatorFolder, // target folder
+                       "",                 // target subdir 
+                       true );             // force flag 
 
-logComment("addDirectory() returned: " + err);
+    logComment("addDirectory() returned: " + err);
 
-registerChrome(CONTENT | DELAYED_CHROME,
+    registerChrome(CONTENT | DELAYED_CHROME,
                getFolder("Chrome","packages/messenger"));
 
-err = getLastError();
-if (err==SUCCESS)
-{
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+	    logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() due to error: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() due to error: " + err);
-}
-
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/makejs.pl

@@ -59,9 +59,14 @@ $inStagePath      = $ARGV[2];
 @inJstFileSplit   = split(/\./,$inJstFile);
 $outJsFile        = $inJstFileSplit[0];
 $outJsFile       .= ".js";
+$outTempFile      = $inJstFileSplit[0];
+$outTempFile     .= ".template";
+
+system("cp ../common/share.t $outTempFile");
+system("cat $inJstFile >> $outTempFile");
 
 # Open the input template file
-open(fpInJst, "<$inJstFile") || die "\nCould not open $inJstFile: $!\n";
+open(fpInJst, "<$outTempFile") || die "\ncould not open $outTempFile: $!\n";
 
 # Open the output .js file
 open(fpOutJs, ">$outJsFile") || die "\nCould not open $outJsFile: $!\n";
@@ -101,6 +106,8 @@ while($line = <fpInJst>)
   print fpOutJs $line;
 }
 
+system("rm $outTempFile");
+
 ##
 # GetSpaceRequired
 #

xpinstall/packager/unix/talkback.jst

@@ -1,25 +1,32 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Talkback", "/FullCircle/TalkBack", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Program");
 logComment("communicatorFolder: " + communicatorFolder);
 
-err = addDirectory("Program",
-                   "$Version$",
-                   "bin",              // jar source folder 
-                   communicatorFolder, // target folder 
-                   "",                 // target subdir 
-                   true );             // force flag 
-
-logComment("addDirectory() returned: " + err);
-
-if (err==SUCCESS)
+if (verifyDiskSpace(communicatorFolder, srDest))
 {
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    err = addDirectory("Program",
+                       "$Version$",
+                       "bin",              // jar source folder 
+                       communicatorFolder, // target folder 
+                       "",                 // target subdir 
+                       true );             // force flag 
+
+    logComment("addDirectory() returned: " + err);
+
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+	    logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() returned: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() returned: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/unix/xpcom.jst

@@ -1,25 +1,32 @@
+var srDest = $SpaceRequired$;
+
 var err = initInstall("Mozilla Seamonkey", "Seamonkey", "$Version$"); 
 logComment("initInstall: " + err);
 
 var communicatorFolder = getFolder("Program");
 logComment("communicatorFolder: " + communicatorFolder);
 
-err = addDirectory("Program",
-                   "$Version$",
-                   "bin",              // jar source folder 
-                   communicatorFolder, // target folder 
-                   "",                 // target subdir 
-                   true );             // force flag 
-
-logComment("addDirectory() returned: " + err);
-
-if (err==SUCCESS)
+if (verifyDiskSpace(communicatorFolder, srDest))
 {
-	err = performInstall(); 
-	logComment("performInstall() returned: " + err);
+    err = addDirectory("Program",
+                       "$Version$",
+                       "bin",              // jar source folder 
+                       communicatorFolder, // target folder 
+                       "",                 // target subdir 
+                       true );             // force flag 
+
+    logComment("addDirectory() returned: " + err);
+
+    if (err==SUCCESS)
+    {
+	    err = performInstall(); 
+	    logComment("performInstall() returned: " + err);
+    }
+    else
+    {
+	    cancelInstall(err);
+	    logComment("cancelInstall() returned: " + err);
+    }
 }
 else
-{
-	cancelInstall(err);
-	logComment("cancelInstall() returned: " + err);
-}
+    cancelInstall(INSUFFICIENT_DISK_SPACE);