aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/fj-mkdeb.py
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/fj-mkdeb.py')
-rwxr-xr-xcontrib/fj-mkdeb.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/fj-mkdeb.py b/contrib/fj-mkdeb.py
index 854e8d1a8..b215b157b 100755
--- a/contrib/fj-mkdeb.py
+++ b/contrib/fj-mkdeb.py
@@ -12,7 +12,7 @@ import os, subprocess, sys
12def run(srcdir, args): 12def run(srcdir, args):
13 if srcdir: os.chdir(srcdir) 13 if srcdir: os.chdir(srcdir)
14 14
15 if not (os.path.isfile('./mkdeb.sh.in')): 15 if not (os.path.isfile('./mkdeb.sh')):
16 print('Error: Not a firejail source tree? Exiting.') 16 print('Error: Not a firejail source tree? Exiting.')
17 return 1 17 return 1
18 18
@@ -22,7 +22,7 @@ def run(srcdir, args):
22 # prefix should ALWAYS be /usr here. Discard user-set values 22 # prefix should ALWAYS be /usr here. Discard user-set values
23 args.remove(a) 23 args.remove(a)
24 24
25 # Run configure to generate mkdeb.sh. 25 # Run configure to generate config.sh.
26 first_config = subprocess.call(['./configure', '--prefix=/usr'] + args) 26 first_config = subprocess.call(['./configure', '--prefix=/usr'] + args)
27 if first_config != 0: 27 if first_config != 0:
28 return first_config 28 return first_config
@@ -62,9 +62,9 @@ usage:
62 if not (srcdir): 62 if not (srcdir):
63 # srcdir not manually specified, try to auto-detect 63 # srcdir not manually specified, try to auto-detect
64 srcdir = os.path.dirname(os.path.abspath(sys.argv[0] + '/..')) 64 srcdir = os.path.dirname(os.path.abspath(sys.argv[0] + '/..'))
65 if not (os.path.isfile(srcdir + '/mkdeb.sh.in')): 65 if not (os.path.isfile(srcdir + '/mkdeb.sh')):
66 # Script is probably installed. Check the cwd. 66 # Script is probably installed. Check the cwd.
67 if os.path.isfile('./mkdeb.sh.in'): 67 if os.path.isfile('./mkdeb.sh'):
68 srcdir = None 68 srcdir = None
69 else: 69 else:
70 print( 70 print(