Merge pull request #736 from chrisglass/more-tests-2

[electrum-nvc.git] / contrib / make_download

diff --git a/contrib/make_download b/contrib/make_download
index ea76d22..8d0d2f3 100755 (executable)
--- a/contrib/make_download
+++ b/contrib/make_download
@@ -1,34 +1,33 @@
 #!/usr/bin/python
 import sys
-string = sys.stdin.read()
+import hashlib
+import os
 
+from versions import version, version_win, version_mac, template_path, dl_path
 
-import hashlib, os
-version = "1.7.3"
-version_win = "1.7.2"
-version_mac = "1.7.2"
+with open(template_path) as f:
+    string = f.read()
 
-_tgz="Electrum-%s.tar.gz"%version
-_zip="Electrum-%s.zip"%version
+_tgz = "Electrum-%s.tar.gz" % version
+_zip = "Electrum-%s.zip" % version
 
-_mac="electrum-v%s.dmg"%version_mac
-_win="Electrum-%s.exe"%version_win
-_win_setup="Electrum-%s-setup.exe"%version_win
-_win_portable="Electrum-%s-portable.exe"%version_win
+_mac = "electrum-%s.dmg" % version_mac
+_win = "electrum-%s.exe" % version_win
+_win_setup = "electrum-%s-setup.exe" % version_win
+_win_portable = "electrum-%s-portable.exe" % version_win
 
 md5_tgz = hashlib.md5(file('dist/'+_tgz, 'r').read()).digest().encode('hex')
 md5_zip = hashlib.md5(file('dist/'+_zip, 'r').read()).digest().encode('hex')
 
 for n in [_win, _win_portable, _win_setup, _mac]:
-    if not os.path.exists("binaries/%s"%n):
-        os.system("wget http://download.electrum.org/download/%s -O binaries/%s"%(n,n))
+    if not os.path.exists("binaries/%s" % n):
+        os.system("wget http://download.electrum.org/download/%s -O binaries/%s" % (n, n))
 
 md5_mac = hashlib.md5(file('binaries/'+_mac, 'r').read()).digest().encode('hex')
 md5_win = hashlib.md5(file('binaries/'+_win, 'r').read()).digest().encode('hex')
 md5_win_setup = hashlib.md5(file('binaries/'+_win_setup, 'r').read()).digest().encode('hex')
 md5_win_portable = hashlib.md5(file('binaries/'+_win_portable, 'r').read()).digest().encode('hex')
 
-
 string = string.replace("##VERSION##", version)
 string = string.replace("##VERSION_WIN##", version_win)
 string = string.replace("##VERSION_MAC##", version_mac)
@@ -39,8 +38,6 @@ string = string.replace("##md5_win##", md5_win)
 string = string.replace("##md5_win_setup##", md5_win_setup)
 string = string.replace("##md5_win_portable##", md5_win_portable)
 
+with open(dl_path,'w') as f:
+    f.write(string)
 
-print string
-
-
-#