diff options
| -rwxr-xr-x | scripts/build/bootstrap_cdebootstrap | 35 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 39 |
2 files changed, 42 insertions, 32 deletions
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 5f483e202..6aad9240a 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -8,8 +8,8 @@ ## under certain conditions; see COPYING for details. -import configparser import argparse +import configparser import os import sys import shutil @@ -22,26 +22,13 @@ import subprocess # - cdebootstrap-options from config def main(): - ## Parsing Configuration - config = configparser.ConfigParser() - - config.read('config/build') - - try: - architecture = config.get('Image', 'Architecture') - distribution = config.get('Image', 'Parent-Distribution') - mirror_bootstrap = config.get('Image', 'Parent-Mirror-Bootstrap') - except: - distribution = config.get('Image', 'Distribution') - mirror_bootstrap = config.get('Image', 'Mirror-Bootstrap') - ## Parsing Arguments arguments = argparse.ArgumentParser( prog = 'lb bootstrap_cdebootstrap', usage = '%(prog)s [arguments]', description = '''live-build contains the programs to build a live system from a configuration directory. The lb bootstrap_cdebootstrap program bootstraps the chroot system with cdebootstrap.''', - epilog = 'live-build was written by Daniel Baumann <mail@daniel-baumann.ch>.', + epilog = 'See \'man lb_bootstrap_cdebootstrap\' for more information.', version = 'live-build 4.0', formatter_class = argparse.ArgumentDefaultsHelpFormatter ) @@ -51,6 +38,24 @@ def main(): args = arguments.parse_args() + ## Parsing Configuration + if not os.path.isfile('config/build'): + print('E: config/build - no such file') + + sys.exit(1) + + config = configparser.ConfigParser() + + config.read('config/build') + + try: + architecture = config.get('Image', 'Architecture') + distribution = config.get('Image', 'Parent-Distribution') + mirror_bootstrap = config.get('Image', 'Parent-Mirror-Bootstrap') + except: + distribution = config.get('Image', 'Distribution') + mirror_bootstrap = config.get('Image', 'Mirror-Bootstrap') + # --verbose verbose = args.verbose diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 7cfc8695a..262a7d5c2 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -8,8 +8,8 @@ ## under certain conditions; see COPYING for details. -import configparser import argparse +import configparser import os import sys import shutil @@ -22,28 +22,13 @@ import subprocess # - debootstrap-options from config def main(): - ## Parsing Configuration - config = configparser.ConfigParser() - - config.read('config/build') - - try: - architecture = config.get('Image', 'Architecture') - archive_areas = config.get('Image', 'Parent-Archive-Areas') - distribution = config.get('Image', 'Parent-Distribution') - mirror_bootstrap = config.get('Image', 'Parent-Mirror-Bootstrap') - except: - archive_areas = config.get('Image', 'Archive-Areas') - distribution = config.get('Image', 'Distribution') - mirror_bootstrap = config.get('Image', 'Mirror-Bootstrap') - ## Parsing Arguments arguments = argparse.ArgumentParser( prog = 'lb bootstrap_debootstrap', usage = '%(prog)s [arguments]', description = '''live-build contains the programs to build a live system from a configuration directory. The lb bootstrap_debootstrap program bootstraps the chroot system with debootstrap.''', - epilog = 'live-build was written by Daniel Baumann <mail@daniel-baumann.ch>.', + epilog = 'See \'man lb_bootstrap_debootstrap\' for more information.', version = 'live-build 4.0', formatter_class = argparse.ArgumentDefaultsHelpFormatter ) @@ -53,6 +38,26 @@ def main(): args = arguments.parse_args() + ## Parsing Configuration + if not os.path.isfile('config/build'): + print('E: config/build - no such file') + + sys.exit(1) + + config = configparser.ConfigParser() + + config.read('config/build') + + try: + architecture = config.get('Image', 'Architecture') + archive_areas = config.get('Image', 'Parent-Archive-Areas') + distribution = config.get('Image', 'Parent-Distribution') + mirror_bootstrap = config.get('Image', 'Parent-Mirror-Bootstrap') + except: + archive_areas = config.get('Image', 'Archive-Areas') + distribution = config.get('Image', 'Distribution') + mirror_bootstrap = config.get('Image', 'Mirror-Bootstrap') + # --verbose verbose = args.verbose |