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_live | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts/build/source_live') diff --git a/scripts/build/source_live b/scripts/build/source_live index 66b2e9beb..e03a37677 100755 --- a/scripts/build/source_live +++ b/scripts/build/source_live @@ -29,10 +29,11 @@ fi Echo_message "Begin copying live-build configuration..." # Requiring stage file -Require_stagefile .build/config .build/bootstrap +Require_stagefile config bootstrap # Checking stage file -Check_stagefile .build/source_live +STAGE_FILE="source_live" +Check_stagefile "${STAGE_FILE}" # Acquire lock file Acquire_lockfile @@ -61,4 +62,4 @@ packages used in the "live" disc). EOF # Creating stage file -Create_stagefile .build/source_live +Create_stagefile "${STAGE_FILE}" -- cgit v1.2.3