Neaten, reduce unneeded verbosity

pde · pde · commit c52b1f9afad0 · 2014-09-02T11:10:00.000-07:00
diff --git a/makexpi.sh b/makexpi.sh
@@ -140,7 +140,8 @@ else
   echo >&2 "Created $XPI_NAME"
 
   # Push to Android Firefox if device is connected
-  if type adb > /dev/null; then
+  # XXX on some systems, adb may require sudo...
+  if type adb > /dev/null && adb devices > /dev/null 2>/dev/null ; then
     ADB_FOUND=`adb devices | tail -2 | head -1 | cut -f 1 | sed 's/ *$//g'`
     if [ "$ADB_FOUND" != "List of devices attached" ]; then
       echo Pushing "$XPI_NAME" to /sdcard/"$XPI_NAME"
diff --git a/src/chrome/content/ruleset-tests.js b/src/chrome/content/ruleset-tests.js
@@ -28,7 +28,6 @@ function openStatus() {
 function addTestTarget(urls, target, ruleset_ids) {
   // Add one target and associated metadata to the list of
   // URLs to be tested, performing housekeeping along the way
-  HTTPSEverywhere.log(5, "target is " + target);
   var active_ids = [];
   for (var n = 0; n < ruleset_ids.length; n++) {
     var rs_id = ruleset_ids[n];
@@ -61,16 +60,18 @@ function testRunner() {
   var output = [];
   var urls = [];
   var num = 0;
-  var targets = HTTPSEverywhere.https_rules.targets;
+  var targets_to_ids = HTTPSEverywhere.https_rules.targets;
+  var ruleset_ids;
  
-  for(var target in targets) {
+  for(var target in targets_to_ids) {
     var t;
+    ruleset_ids = targets_to_ids[target];
     if(target.indexOf("*") == -1)  {
-      addTestTarget(urls, target, targets[target]);
+      addTestTarget(urls, target, ruleset_ids);
     } else {
       // target is like *.example.wildcard.com, let's see what we can do...
       t = target.replace("*.", "www.");
-      if (!(t in targets)) { addTestTarget(urls, t, targets[target]); }
+      if (!(t in targets_to_ids)) { addTestTarget(urls, t, ruleset_ids); }
     }
   }
 
