From 1ea5c7057193337e15eb58ef5ef4ff56a4e03d5e Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Sun, 20 Jul 2014 17:05:12 +0200 Subject: [PATCH] winfreed: add preliminary support for different architectures --- template.ini | 10 ++++++++-- winfreed.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/template.ini b/template.ini index 319503f..59ecd78 100644 --- a/template.ini +++ b/template.ini @@ -11,7 +11,13 @@ description = Example program doesn't do anything useful that we know of. license = GPL ; A URL can have parametric language and version -url = http://example.com/program-%(version)s-%(language)s.zip +url_i386 = http://example.com/program-%(version)s-%(language)s.exe +url_x64 = http://example.com/program-%(version)s-%(language)s.msi + +; If no Architecture-specific URL is available, use just 'url' +;url = http://example.com/program-%(version)s-%(language)s.exe version = 1.0 -md5 = 564ad4bb65013635017a04d5e7098b9e + +; TODO, checksums or signatures are not supported for now +;md5 = 564ad4bb65013635017a04d5e7098b9e diff --git a/winfreed.py b/winfreed.py index e7f186e..ef96bc5 100755 --- a/winfreed.py +++ b/winfreed.py @@ -2,7 +2,7 @@ # # winfreed - download a selection of Free Software for MS Windows. # -# Copyright (C) 2011 Antonio Ospite +# Copyright (C) 2011-2014 Antonio Ospite # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,6 +27,9 @@ from progressbar import Bar, ETA, FileTransferSpeed, Percentage, ProgressBar OUTPUT_DIR = 'downloads' LANGCODE = 'en-US' +# One of i386 or x64 +ARCHITECTURE = 'x64' + PKG_DIR = 'pkgs' CHUNK_SIZE = 8192 @@ -127,7 +130,10 @@ def download_file(src_url, dest_dir): def download(pkg): - pkg_url = pkg['url'] + try: + pkg_url = pkg['url_' + ARCHITECTURE] + except KeyError: + pkg_url = pkg['url'] download_file(pkg_url, OUTPUT_DIR) -- 2.1.4