Changeset 627

Timestamp:

01/19/08 15:15:24 (11 months ago)

Author:

boo..@youngpup.net

Message:

Backup gm_scripts dir the first time 0.8 runs. Paranoia and all that.

Files:

• trunk/src/chrome/chromeFiles/content/updater.js (modified) (2 diffs)
• trunk/src/chrome/chromeFiles/content/utils.js (modified) (1 diff)
• trunk/src/chrome/chromeFiles/content/versioning.js (modified) (3 diffs)
• trunk/src/components/greasemonkey.js (modified) (1 diff)

trunk/src/chrome/chromeFiles/content/updater.js

@@ -103 +103 @@
-  this.update();
-};
-
-/**
- * Compares two version numbers
- *
- * @param {String} aV1 Version of first item in 1.2.3.4..9. format
- * @param {String} aV2 Version of second item in 1.2.3.4..9. format
- *
- * @returns {Int}  1 if first argument is higher
- *                 0 if arguments are equal
- *                 -1 if second argument is higher
- */
-ExtensionUpdater.prototype.compareVersions = function(aV1, aV2) {
-  var v1 = aV1.split(".");
-  var v2 = aV2.split(".");
-  var numSubversions = (v1.length > v2.length) ? v1.length : v2.length;
-
-  for (var i = 0; i < numSubversions; i++) {
-    if (typeof v2[i] == 'undefined') {
-      return 1;
-    }
-
-    if (typeof v1[i] == 'undefined') {
-      return -1;
-    }
-
-    if (parseInt(v2[i], 10) > parseInt(v1[i], 10)) {
-      return -1;
-    } else if (parseInt(v2[i], 10) < parseInt(v1[i], 10)) {
-      return 1;
-    }
-  }
-
-  // v2 was never higher or lower than v1
-  return 0;
-}
-
-/**
@@ -271 +236 @@
-           "updateLink: " + this.updateLink);
-
-this.
+GM_
-      GM_log("ExtensionUpdater: Local version is old, now installing " +
-             "update...");

trunk/src/chrome/chromeFiles/content/utils.js

@@ -334 +334 @@
-
-/**
+ * Compares two version numbers
+ *
+ * @param {String} aV1 Version of first item in 1.2.3.4..9. format
+ * @param {String} aV2 Version of second item in 1.2.3.4..9. format
+ *
+ * @returns {Int}  1 if first argument is higher
+ *                 0 if arguments are equal
+ *                 -1 if second argument is higher
+ */
+function GM_compareVersions(aV1, aV2) {
+  var v1 = aV1.split(".");
+  var v2 = aV2.split(".");
+  var numSubversions = (v1.length > v2.length) ? v1.length : v2.length;
+
+  for (var i = 0; i < numSubversions; i++) {
+    if (typeof v2[i] == 'undefined') {
+      return 1;
+    }
+
+    if (typeof v1[i] == 'undefined') {
+      return -1;
+    }
+
+    if (parseInt(v2[i], 10) > parseInt(v1[i], 10)) {
+      return -1;
+    } else if (parseInt(v2[i], 10) < parseInt(v1[i], 10)) {
+      return 1;
+    }
+  }
+
+  // v2 was never higher or lower than v1
+  return 0;
+}
+
+/**
- * Takes the place of the traditional prompt() function which became broken
- * in FF 1.0.1. :(

trunk/src/chrome/chromeFiles/content/versioning.js

@@ -9 +9 @@
-  var initialized = GM_prefRoot.getValue("version", "0.0");
-
-!GM_versionIsGreaterOrEqual(initialized, "0.3")
+GM_compareVersions(initialized, "0.3") == -1
-    GM_pointThreeMigrate();
-  }
-
-!GM_versionIsGreaterOrEqual(initialized, "0.4.2")
+GM_compareVersions(initialized, "0.4.2") == -1
-    GM_pointFourMigrate();
+  }
+
+  if (GM_compareVersions(initialized, "0.8") == -1) {
+    GM_pointEightBackup();
-  }
-
@@ -25 +29 @@
-
-  log("< GM_updateVersion");
+};
+
+/**
+ * In Greasemonkey 0.8 there was a format change to the gm_scripts folder and
+ * testing found several bugs where the entire folder would get nuked. So we are
+ * paranoid and backup the folder the first time 0.8 runs.
+ */
+function GM_pointEightBackup() {
+  var scriptDir = getNewScriptDir();
+  var scriptDirBackup = scriptDir.clone();
+  scriptDirBackup.leafName += "_08bak";
+  if (scriptDir.exists() && !scriptDirBackup.exists()) {
+    scriptDir.copyTo(scriptDirBackup.parent, scriptDirBackup.leafName);
+  }
-};
-
@@ -149 +167 @@
-};
-
-function GM_versionIsGreaterOrEqual(v1, v2) {
-  v1 = v1.split(".");
-  v2 = v2.split(".");
-
-  if (v1[0] == "") v1[0] = "0";
-  if (v2[0] == "") v2[0] = "0";
-
-  while (v1.length < v2.length) {
-    v1.push("0");
-  }
-
-  while (v2.length < v1.length) {
-    v2.push("0");
-  }
-
-  var diff;
-  for (var i = 0; i < v1.length; i++) {
-    diff = parseInt(v1[i]) - parseInt(v2[i]);
-
-    if (diff != 0) {
-      return diff > 0;
-    } else {
-      continue;
-    }
-  }
-
-  return 0;
-};
-
-function GM_getPointThreeScriptDir() {
-  var file = getContentDir();

trunk/src/components/greasemonkey.js

@@ -124 +124 @@
-    Cc["@mozilla.org/moz/jssubscript-loader;1"]
-      .getService(Ci.mozIJSSubScriptLoader)
+      .loadSubScript("chrome://greasemonkey/content/utils.js");
+
+    Cc["@mozilla.org/moz/jssubscript-loader;1"]
+      .getService(Ci.mozIJSSubScriptLoader)
-      .loadSubScript("chrome://greasemonkey/content/versioning.js");
-
-    Cc["@mozilla.org/moz/jssubscript-loader;1"]
-      .getService(Ci.mozIJSSubScriptLoader)
-      .loadSubScript("chrome://greasemonkey/content/utils.js");
-
-    Cc["@mozilla.org/moz/jssubscript-loader;1"]