Fix gifsicle & pciutils

rasa · Feb 23, 2017 · d464ba8 · d464ba8
1 parent b4c1eec
commit d464ba8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/gifsicle.json b/gifsicle.json
@@ -12,13 +12,15 @@
         }
     },
     "autoupdate": {
-        "32bit": {
-            "extract_dir": "gifsicle-$version-win32",        
-            "url": "https://eternallybored.org/misc/gifsicle/releases/gifsicle-$version-win32.zip"
-        },
-        "64bit": {
-            "extract_dir": "gifsicle-$version-win64",        
-            "url": "https://eternallybored.org/misc/gifsicle/releases/gifsicle-$version-win64.zip"
+        "architecture": {
+            "32bit": {
+                "extract_dir": "gifsicle-$version-win32",
+                "url": "https://eternallybored.org/misc/gifsicle/releases/gifsicle-$version-win32.zip"
+            },
+            "64bit": {
+                "extract_dir": "gifsicle-$version-win64",
+                "url": "https://eternallybored.org/misc/gifsicle/releases/gifsicle-$version-win64.zip"
+            }
         }
     },
     "bin": [

diff --git a/jsonfmt.py b/jsonfmt.py
@@ -8,11 +8,11 @@
 import os
 import sys
 
-if sys.version_info >= (3, 0):
-    sys.exit("Sorry, this script has only been tested with Python 2.x")
-
 
 def decode(s):
+    if sys.version_info >= (3, 0):
+        return s
+
     for encoding in 'utf-8-sig', 'utf-16':
         try:
             return s.decode(encoding)

diff --git a/pciutils.json b/pciutils.json
@@ -12,13 +12,15 @@
         }
     },
     "autoupdate": {
-        "32bit": {
-            "extract_dir": "pciutils-$version-win32",
-            "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-$version-win32.zip"
-        },
-        "64bit": {
-            "extract_dir": "pciutils-$version-win64",
-            "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-$version-win64.zip"
+        "architecture": {
+            "32bit": {
+                "extract_dir": "pciutils-$version-win32",
+                "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-$version-win32.zip"
+            },
+            "64bit": {
+                "extract_dir": "pciutils-$version-win64",
+                "url": "https://eternallybored.org/misc/pciutils/releases/pciutils-$version-win64.zip"
+            }
         }
     },
     "bin": [

diff --git a/validate.py b/validate.py
@@ -13,6 +13,9 @@
 
 
 def decode(s):
+    if sys.version_info >= (3, 0):
+        return s
+
     for encoding in 'utf-8-sig', 'utf-16':
         try:
             return s.decode(encoding)
@@ -33,7 +36,7 @@ def decode(s):
     schema_data = json.load(f)
 
 with open(file, 'r') as f:
-    jstr = f.read(os.path.getsize(file))
+    jstr = f.read()
 
 jstr_no_bom = decode(jstr)
 failed = file + '.failed'