From 2d454ec6a1dba0cccbd1bd1fb193ac20caedea7e Mon Sep 17 00:00:00 2001
From: Luke Sampson <me@lukesampson.com>
Date: Mon, 5 Aug 2013 12:31:31 +1000
Subject: [PATCH] try to get arch specific prop, then fallback to generic, so
 that MSI etc can be re-used between architectures if possible. Fix 'missing
 manifest' message when manifest is invalid

---
 7zip.json | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/7zip.json b/7zip.json
index e5f9887504..51ee82e51e 100644
--- a/7zip.json
+++ b/7zip.json
@@ -5,20 +5,16 @@
 	"architecture": {
 		"64bit": {
 			"url": "http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920-x64.msi",
-			"hash": "sha256:62df458bc521001cd9a947643a84810ecbaa5a16b5c8e87d80df8e34c4a16fe2",
-			"msi": {
-				"silent": true,
-				"code": "{23170F69-40C1-2702-0920-000001000000}"
-			}
+			"hash": "sha256:62df458bc521001cd9a947643a84810ecbaa5a16b5c8e87d80df8e34c4a16fe2"
 		},
 		"32bit": {
 			"url": "http://downloads.sourceforge.net/project/sevenzip/7-Zip/9.20/7z920.msi",
-			"hash": "sha256:fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8",
-			"msi": {
-				"silent": true,
-				"code": "{23170F69-40C1-2701-0920-000001000000}"
-			}
+			"hash": "sha256:fe4807b4698ec89f82de7d85d32deaa4c772fc871537e31fb0fccf4473455cb8"
 		}
 	},
+	"msi": {
+		"silent": true,
+		"code": "{23170F69-40C1-2701-0920-000001000000}"
+	},
 	"bin": "7z.exe"
 }
\ No newline at end of file