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_interactive | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/chroot_interactive') diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive index a2b6cda55..9a536c61a 100755 --- a/scripts/build/chroot_interactive +++ b/scripts/build/chroot_interactive @@ -29,10 +29,11 @@ fi Echo_message "Begin interactive build..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap # Checking stage file -Check_stagefile .build/chroot_interactive +STAGE_FILE="chroot_interactive" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -53,4 +54,4 @@ case "${LB_INTERACTIVE}" in esac # Creating stage file -Create_stagefile .build/chroot_interactive +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3