Merge default.

--HG--
branch : key-processing

common/Makefile

@@ -35,8 +35,8 @@ XPI_TEXTS     = js jsm $(JAR_TEXTS)
 XPI_BINS      = $(JAR_BINS)
 
 XPI_NAME      = $(NAME)-$(VERSION)
-XPI_PATH      = ../downloads/$(XPI_NAME)
-XPI           = $(XPI_PATH).xpi
+XPI           =  ../downloads/$(XPI_NAME).xpi
+XPI_PATH      = $(TOP)$(XPI:%.xpi=%)
 
 RDF           = ../downloads/update.rdf
 RDF_IN        = $(RDF).in
@@ -47,7 +47,7 @@ AWK       ?= awk
 B64ENCODE ?= base64
 CURL      ?= curl
 
-#.SILENT:
+.SILENT:
 
 #### rules
 
@@ -84,7 +84,6 @@ info:
 	@echo "doc files           $(DOC_FILES)"
 	@echo "xpi files           $(XPI_FILES)"
 
-xpi: $(XPI)
 jar: $(JAR)
 
 release: $(XPI) $(RDF)
@@ -169,17 +168,17 @@ test: $(XPI)
 
 #### xpi
 
-$(XPI): $(CHROME)
+xpi: $(CHROME)
 	@echo "Building XPI..."
-	mkdir -p $(XPI_PATH)
+	mkdir -p "$(XPI_PATH)"
 
 	$(AWK) -v 'name=$(NAME)' -v 'suffix=$(MANGLE)' \
 	       -f $(BASE)/process_manifest.awk \
-	       $(TOP)/chrome.manifest >$(XPI_PATH)/chrome.manifest
+	       $(TOP)/chrome.manifest >"$(XPI_PATH)/chrome.manifest"
 
 	$(MAKE_JAR) "$(XPI)" "$(XPI_BASES)" "$(XPI_DIRS)" "$(XPI_TEXTS)" "$(XPI_BINS)" "$(XPI_FILES)"
 	rm -r -- $(CHROME)
-	@echo "Built XPI: $@"
+	@echo "Built XPI: $(XPI)"
 
 #### jar
 

common/content/dactyl.js

@@ -1648,7 +1648,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 bang: true,
                 completer: function (context) {
                     context.ignoreCase = true;
-                    return completion.dialog(context);
+                    completion.dialog(context);
                 }
             });
 

common/make_jar.sh

@@ -2,7 +2,7 @@
 set -e
 
 fromrepo=
-if [ $1 = -r ]; then shift; fromrepo=1; fi
+if [ "$1" = -r ]; then shift; fromrepo=1; fi
 
 top=$(pwd)
 jar=$1
@@ -15,7 +15,7 @@ files="$@"
 HG=${HG:-hg}
 
 stage="$top/${jar%.*}"
-mkdir -p $stage
+mkdir -p "$stage"
 
 sed=$(which sed)
 if [ "xoo" = x$(echo foo | sed -E 's/f(o)/\1/' 2>/dev/null) ]
@@ -49,7 +49,13 @@ copytext() {
     ( echo "modified: $1"; diff -u -- "$1" "$2" | grep '^[-+][^-+]' )
 }
 
-[ -e "$top/$jar" ] && rm -rf "$top/$jar"
+[ -f "$jar" ] && rm -f "$jar"
+case "$jar" in
+    /*) ;;
+    *)
+        [ -d "$jar" ] && rm -rf "$jar"
+        jar="$top/$jar";;
+esac
 
 for base in $bases
 do
@@ -80,14 +86,14 @@ done
 
 (
     set -e;
-    cd $stage;
-    case $jar in
-    (*/) if [ "$stage" != "$top/$jar" ]; then mv -- * $top/$jar; fi;;
-    (*)  zip -9r "$top/$jar" -- *;;
+    cd "$stage";
+    case "$jar" in
+    (*/) if [ "$stage" != "$jar" ]; then mv -- * "$jar"; fi;;
+    (*)  zip -9r "$jar" -- *;;
     esac
 ) || exit 1
 
-[ "$stage" != "$top/$jar" ] && rm -rf "$stage"
+[ "$stage" != "$jar" ] && rm -rf "$stage"
 true
 
 # vim:se ft=sh sts=4 sw=4 et:

common/modules/base.jsm

@@ -758,6 +758,7 @@ Class.memoize = function memoize(getter)
             this.get = function replace() let (obj = this.instance || this) (
                 Class.replaceProperty(obj, key, null),
                 Class.replaceProperty(obj, key, getter.call(this, key)))
+            this.set = function replace(val) Class.replaceProperty(this.instance || this, val);
         }
     });