From 402025c3c306ea48eef5eef72c8969a35afece5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Fri, 6 Mar 2020 15:15:59 +0100 Subject: [PATCH] fix some build issues - use 'os.name' to decide between Windows/Linux build - don't check Windows executable version number, since Wine fails to run the executable and causes release.sh to stop --- scripts/pyinstaller.py | 3 ++- scripts/release.sh | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/pyinstaller.py b/scripts/pyinstaller.py index 879ae509..f30501b4 100755 --- a/scripts/pyinstaller.py +++ b/scripts/pyinstaller.py @@ -5,11 +5,12 @@ import PyInstaller.__main__ import util +import os PyInstaller.__main__.run([ "--onefile", "--console", - "--name", "gallery-dl." + ("exe" if PyInstaller.is_win else "bin"), + "--name", "gallery-dl." + ("exe" if os.name == "nt" else "bin"), "--additional-hooks-dir", util.path("scripts"), "--distpath", util.path("dist"), "--workpath", util.path("build"), diff --git a/scripts/release.sh b/scripts/release.sh index 31e35635..9ad6aa51 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -72,13 +72,6 @@ build-windows() { sleep 5 done sleep 2 - - # check exe version - OUTPUT="$(wine gallery-dl.exe --version)" - if [[ ! "${OUTPUT%?}" == "${NEWVERSION}" ]]; then - echo "exe version mismatch: ${OUTPUT} != ${NEWVERSION}" - exit 3 - fi } sign() {