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/source_disk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/source_disk') diff --git a/scripts/build/source_disk b/scripts/build/source_disk index ace6d4ebf..77f8afade 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -33,10 +33,11 @@ esac Echo_message "Begin installing disk information..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap # Checking stage file -Check_stagefile .build/source_disk +STAGE_FILE="source_disk" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -118,4 +119,4 @@ case "${LB_DEBIAN_INSTALLER}" in esac # Creating stage file -Create_stagefile .build/source_disk +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3