From f03f05097e49d55cf2314b6a48145bf898e3233c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 3 Nov 2013 20:05:54 +0100 Subject: Also processing config/hooks/*.hook in bootstrap_hooks, if any. --- scripts/build/bootstrap_hooks | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts/build/bootstrap_hooks') diff --git a/scripts/build/bootstrap_hooks b/scripts/build/bootstrap_hooks index b8d144020..2d6887d58 100755 --- a/scripts/build/bootstrap_hooks +++ b/scripts/build/bootstrap_hooks @@ -60,9 +60,9 @@ def main(): sys.exit(1) # hooks - if not glob.glob('config/hooks/*.hook.bootstrap'): + if not glob.glob('config/hooks/*.hook') and not glob.glob('config/hooks/*.hook.bootstrap'): if verbose: - print ('I: no bootstrap hooks found at config/hooks/*.hook.bootstrap - nothing to do') + print ('I: no bootstrap hooks found at config/hooks/*.hook{,.bootstrap} - nothing to do') sys.exit(0) @@ -78,7 +78,9 @@ def main(): # process hooks os.makedirs('chroot/live-build', exist_ok=True) - for hook in glob.glob('config/hooks/*.hook.bootstrap'): + hooks = glob.glob('config/hooks/*.hook') + glob.glob('config/hooks/*.hook.bootstrap') + + for hook in hooks: if verbose: print('I: Copying config/hooks/*.hook.bootstrap to chroot/live-build') -- cgit v1.2.3