From 04d9ee0211e7cf2d5f637941ff6579b4f5462da6 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Thu, 12 Mar 2020 01:21:39 +0000 Subject: stagefiles: simplify & robustify - avoid all need to pass ".build/" path in stage file names into the functions - add a helper to remove a stage file (required to complete the above properly) - avoid duplicating filenames within scripts which makes them prone to mistakes (some instances of which I've actually encountered and had to fix) Gbp-Dch: Short --- scripts/build/chroot_debianchroot | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/build/chroot_debianchroot') diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot index ddad26793..2cd8df566 100755 --- a/scripts/build/chroot_debianchroot +++ b/scripts/build/chroot_debianchroot @@ -22,14 +22,16 @@ USAGE="${PROGRAM} {install|remove} [--force]" Init_config_data "${@}" # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap + +STAGE_FILE="chroot_debianchroot" case "${1}" in install) Echo_message "Configuring file /etc/debian_chroot" # Checking stage file - Check_stagefile .build/chroot_debianchroot + Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -44,7 +46,7 @@ case "${1}" in echo "live" > chroot/etc/debian_chroot # Creating stage file - Create_stagefile .build/chroot_debianchroot + Create_stagefile "${STAGE_FILE}" ;; remove) @@ -63,7 +65,7 @@ case "${1}" in fi # Removing stage file - rm -f .build/chroot_debianchroot + Remove_stagefile "${STAGE_FILE}" ;; *) -- cgit v1.2.3