Merge remote-tracking branch 'janekptacijarabaci/scriptName_suffixDb'

Fixes #2400
greasemonkey · Aug 2, 2016 · 53f5220 · 53f5220
2 parents 8dc54eb + 2674c19
commit 53f5220
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/modules/remoteScript.js b/modules/remoteScript.js
@@ -366,7 +366,9 @@ RemoteScript.prototype.install = function(aOldScript, aOnlyDependencies) {
     var suffix = 0;
     var file = GM_util.scriptDir();
     file.append(this._baseName);
-    while (file.exists()) {
+    // See #2400
+    while (file.exists() || (file.leafName.substr(
+        file.leafName.length - 3).toLowerCase() == ".db")) {
       suffix++;
       file = GM_util.scriptDir();
       file.append(this._baseName + '-' + suffix);