diff --git a/externals/ffmpeg/cpmfile.json b/externals/ffmpeg/cpmfile.json
index ff48ce742d..97ca227939 100644
--- a/externals/ffmpeg/cpmfile.json
+++ b/externals/ffmpeg/cpmfile.json
@@ -5,7 +5,7 @@
         "hash": "2a89d664119debbb3c006ab1c48d5d7f26e889f4a65ad2e25c8b0503308295123d5a9c5c78bf683aef5ff09acef8c3fc2837f22d3e8c611528b933bf03bcdd97",
         "bundled": true
     },
-	"ffmpeg-ci": {
+    "ffmpeg-ci": {
         "ci": true,
         "package": "FFmpeg",
         "name": "ffmpeg",
diff --git a/externals/libusb/cpmfile.json b/externals/libusb/cpmfile.json
index 0bfa0d7a86..80a0b917db 100644
--- a/externals/libusb/cpmfile.json
+++ b/externals/libusb/cpmfile.json
@@ -1,8 +1,8 @@
 {
-	"libusb": {
-		"repo": "libusb/libusb",
-		"sha": "c060e9ce30",
-		"hash": "44647357ba1179020cfa6674d809fc35cf6f89bff1c57252fe3a610110f5013ad678fc6eb5918e751d4384c30e2fe678868dbffc5f85736157e546cb9d10accc",
-		"find_args": "MODULE"
-	}
-}
\ No newline at end of file
+    "libusb": {
+        "repo": "libusb/libusb",
+        "sha": "c060e9ce30",
+        "hash": "44647357ba1179020cfa6674d809fc35cf6f89bff1c57252fe3a610110f5013ad678fc6eb5918e751d4384c30e2fe678868dbffc5f85736157e546cb9d10accc",
+        "find_args": "MODULE"
+    }
+}
diff --git a/tools/cpm-hash.sh b/tools/cpm-hash.sh
index da0fb395db..b740936f4d 100755
--- a/tools/cpm-hash.sh
+++ b/tools/cpm-hash.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-SUM=`wget -q https://github.com/$1/archive/$2.zip -O - | sha512sum`
+SUM=$(wget -q https://github.com/$1/archive/$2.zip -O - | sha512sum)
 echo "$SUM" | cut -d " " -f1
diff --git a/tools/cpm/format-json.sh b/tools/cpm/format-json.sh
new file mode 100755
index 0000000000..6059077fe1
--- /dev/null
+++ b/tools/cpm/format-json.sh
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+FILES=$(find . src -maxdepth 3 -name cpmfile.json)
+
+for file in $FILES; do
+    jq --indent 4 < $file > $file.new
+    mv $file.new $file
+done