summaryrefslogtreecommitdiff
path: root/cscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2020-12-26 22:46:02 +0100
committerCarl Hetherington <cth@carlh.net>2020-12-26 22:46:02 +0100
commit6ae1fa32d82d8632bfa52865045e48f529b3e2e2 (patch)
treeb8e6332f97cf780b00efa2265901a222d2289b11 /cscript
parent79c182e2b427de682396640a24eba2deed4ea281 (diff)
fixup! more cscript hacks.
Diffstat (limited to 'cscript')
-rw-r--r--cscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/cscript b/cscript
index 7253cf142..1ca9aec38 100644
--- a/cscript
+++ b/cscript
@@ -688,10 +688,10 @@ def package(target, version, options):
return package_debian(target, cpu, version, options)
elif target.distro == 'centos' or target.distro == 'fedora' or target.distro == 'mageia':
return package_rpm(target, cpu, version, options)
- elif target.platform == 'osx' and hasattr(target, 'archs') and sorted(target.archs) == sorted('arm64', 'x86_64'):
+ elif target.platform == 'osx' and hasattr(target, 'archs') and sorted(target.archs) == sorted(('arm64', 'x86_64')):
target.command('bash platform/osx/make_dmg.sh %s %s arm-intel-64 %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
- elif target.platform == 'osx' and hasattr(target, 'archs') and sorted(target.archs) == sorted('i386', 'x86_64'):
+ elif target.platform == 'osx' and hasattr(target, 'archs') and sorted(target.archs) == sorted(('i386', 'x86_64')):
target.command('bash platform/osx/make_dmg.sh %s %s intel-32-64 %s %s' % (target.environment_prefix, target.directory, target.apple_id, target.apple_password))
return [os.path.abspath(x) for x in glob.glob('build/platform/osx/DCP-o-matic*.dmg')]
elif target.platform == 'osx' and hasattr(target, 'arch') and target.arch == 'arm64':