From fe9195b59c9647598ecea00900edfe2678bddcac Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Fri, 13 Mar 2020 17:11:53 +0000 Subject: stagefiles: further robustify with auto filenames MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit as suggested by Raphaël rather than have fixed stagefile filename strings at all in the scripts, use `$(basename $0)` to use the name of the script (which is the same for almost all cases anyway, and the stage files are supposed to be almost exclusively unique per-script). we can thus simplify things by determining the filename for most use cases within the functions themselves. this does change the file used by a couple of scripts, affecting backwards compatibility of executing live-build upon an existing partially or fully completed build: - binary_grub-pc used "binary_grub" - chroot_includes used "includes.chroot" care had to be taken for the following cases: - there are some cases like bootstrap_cache, source_debian and bootstrap_debootstrap which are dealing with more than one file, and/or otherwise a filename that is not specific to the script itself exactly, or should not be based upon its name. - some cases like chroot_cache, bootstrap_cache and chroot_install-packages need to append something to the end of the name depending upon which pass/action mode the script is being executed with. - furthermore in the bootstrap_cache case one of the filenames is used within the bootstrap_debootstrap and thus needs very careful handling to be certain that a change in filename of bootstrap_cache does not break bootstrap_debootstrap. Gbp-Dch: Short --- scripts/build/chroot_devpts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'scripts/build/chroot_devpts') diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts index 89c4daa33..ade3fbe7e 100755 --- a/scripts/build/chroot_devpts +++ b/scripts/build/chroot_devpts @@ -24,14 +24,12 @@ Init_config_data "${@}" # Requiring stage file Require_stagefile config bootstrap -STAGE_FILE="chroot_devpts" - case "${1}" in install) Echo_message "Begin mounting /dev/pts..." # Checking stage file - Check_stagefile "${STAGE_FILE}" + Check_stagefile # Acquire lock file Acquire_lockfile @@ -43,7 +41,7 @@ case "${1}" in mount -t devpts -o gid=5,mode=620,x-gvfs-hide devpts-live chroot/dev/pts || true # Creating stage file - Create_stagefile "${STAGE_FILE}" + Create_stagefile ;; remove) @@ -61,7 +59,7 @@ case "${1}" in fi # Removing stage file - Remove_stagefile "${STAGE_FILE}" + Remove_stagefile ;; *) -- cgit v1.2.3