From a9341594ad3900cdb507cdb0a45a1e0e2d512c67 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Wed, 30 Jun 2021 10:31:06 +0200 Subject: [PATCH] try autodetecting --distro parameter --- build.py | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/build.py b/build.py index 252f6b1..4b7ce4c 100755 --- a/build.py +++ b/build.py @@ -7,12 +7,14 @@ nightly_ver = '91.0a1' # build.py - try move functionality away from that too big/horrible build script. # + import optparse import sys import os import glob import time + start_time = time.time() parser = optparse.OptionParser() @@ -20,10 +22,29 @@ parser.add_option('-x', '--cross', dest='cross_compile', default=False, parser.add_option('-n', '--no-execute', dest='no_execute', default=False, action="store_true") parser.add_option('-l', '--no-librewolf', dest='no_librewolf', default=False, action="store_true") parser.add_option('-s', '--src', dest='src', default='release') -parser.add_option('-t', '--distro', dest='distro', default='win') +parser.add_option('-t', '--distro', dest='distro', default='autodetect') parser.add_option('-T', '--token', dest='token', default='') options, remainder = parser.parse_args() + +# try autodetecting options.distro +if options.distro == 'autodetect': + options.distro = 'win' + if os.path.isdir('/Applications'): + options.distro = 'osx' + elif os.path.isdir('/etc'): + options.distro = 'rpm' + if os.path.isdir('/etc/apt'): + options.distro = 'deb' + print('[debug]: autoselected --distro {}'.format(options.distro)) + + + + + + + + def script_exit(statuscode): if (time.time() - start_time) > 60: @@ -388,8 +409,8 @@ def execute_upload(): zip_filename = "librewolf-{}.en-US.{}.zip".format(pkgver,ospkg) - setup_filename = "librewolf-{}.en-US.win64-setup.exe".format(pkgver) - nightly_setup_filename = "librewolf-{}.en-US.win64-nightly-setup.exe".format(nightly_ver) + setup_filename = "librewolf-{}.en-US.{}-setup.exe".format(pkgver,ospkg) + nightly_setup_filename = "librewolf-{}.en-US.{}-nightly-setup.exe".format(nightly_ver,ospkg) if not os.path.isfile(zip_filename): print("fatal error: File '{}' not found.".format(zip_filename)) @@ -407,12 +428,18 @@ def execute_upload(): do_upload(zip_filename) do_upload(nightly_setup_filename) do_upload("sha256sums.txt") + print("upload.txt: Upload JSON api results are in the file \'upload.txt\'.") + + + # # Main targets: # + + def execute_all(): execute_fetch() execute_extract()