From 1b09ab5a7989d50500b58574ccd73e86df82b66f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 26 Sep 2016 07:11:22 -0400 Subject: [PATCH] buildserver: run dir check as very first thing No point in running any other code if the script is just going to bail out with an error. This assumes that ./makebuildserver is only ever run from a git clone of fdroidserver.git. --- makebuildserver | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/makebuildserver b/makebuildserver index 69eea7b6..eb41a211 100755 --- a/makebuildserver +++ b/makebuildserver @@ -13,6 +13,11 @@ from clint.textui import progress from optparse import OptionParser +if not os.path.exists('makebuildserver') and not os.path.exists('buildserver'): + print('This must be run as ./makebuildserver in fdroidserver.git!') + sys.exit(1) + + def vagrant(params, cwd=None, printout=False): """Run vagrant. @@ -87,10 +92,6 @@ elif os.path.exists('makebs.config.py'): if '__builtins__' in config: del(config['__builtins__']) # added by compile/exec -if not os.path.exists('makebuildserver') or not os.path.exists(serverdir): - print('This must be run from the correct directory!') - sys.exit(1) - if os.path.exists(boxfile): os.remove(boxfile) -- 2.30.2