From f32a5c5b20ee3e18d418b2c737b4cb10be3837e3 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Mon, 9 Nov 2009 21:31:29 -0300 Subject: Avoid force/rebuild of squashfs images if already updated. Check if there are any modification of files/directories inside the target directory for squashfs image. Implements in some way this item in TODO: * Add 'needsupdate' function to check if a squashfs image in the iso dir is up to date, if so, skip it; else rebuild it. No more need for the -f flag Signed-off-by: Gerardo Exequiel Pozzi --- archiso/mkarchiso | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'archiso') diff --git a/archiso/mkarchiso b/archiso/mkarchiso index b6d0f54..e71660e 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -159,13 +159,13 @@ _mksquash () { sqimg="${work_dir}/iso/$(basename ${1}).sqfs" echo "====> Generating SquashFS image for '${1}'" if [ -e "${sqimg}" ]; then - if [ "${FORCE}" = "y" ]; then - echo -n "Removing old SquashFS image..." + dirhaschanged=$(find ${1} -newer ${sqimg}) + if [ "${dirhaschanged}" != "" ]; then + echo "SquashFS image '${sqimg}' is not up to date, rebuilding..." rm "${sqimg}" - echo "done." else - echo "error: SquashFS image '${sqimg}' already exists, aborting." - exit 1 + echo "SquashFS image '${sqimg}' is up to date, skipping." + return fi fi -- cgit v1.2.3-54-g00ecf