=== modified file 'common.zsh' --- common.zsh 2017-12-01 17:45:44 +0000 +++ common.zsh 2017-12-01 00:18:21 +0000 @@ -145,14 +145,11 @@ return 0 } -exit-unchanged() { - info "$DO:t unchanged, skipping build" - cp $FILE $OUT - exit 0 -} exit-if-unchanged() { if is-unchanged; then - exit-unchanged + info "$DO:t skipping, unchanged dependencies" + cp $FILE $OUT + exit 0 else print-meta > $FILE.new [[ -f $FILE ]] && cp $FILE $FILE.prev === modified file 'functions/clone-depend-if-changed' --- functions/clone-depend-if-changed 2017-12-01 17:45:44 +0000 +++ functions/clone-depend-if-changed 2017-12-01 17:13:06 +0000 @@ -14,15 +14,16 @@ vars[fstab]+="overlay ${vars[build_dir]:A} overlay ${(j:,:)mount_opts} 0 0 " +mount -a --fstab /dev/stdin <<<$vars[fstab] \ + || die "Failed to mount ${(qqq)vars[build_dir]}" +grep -q "^overlay ${vars[build_dir]:A} overlay" /proc/mounts \ + || die "Not visible as mounted: ${(qqq)vars[build_dir]}" + hash-changes -if is-unchanged; - mount -a --fstab /dev/stdin <<<$vars[fstab] \ - || die "Failed to mount ${(qqq)vars[build_dir]}" - grep -q "^overlay ${vars[build_dir]:A} overlay" /proc/mounts \ - || die "Not visible as mounted: ${(qqq)vars[build_dir]}" - exit-unchanged -fi -local -a remove +exit-if-unchanged + +local remove + [[ -e $vars[changes_dir] ]] && remove+=( $vars[changes_dir]/*(DN) ) [[ -e $vars[work_dir] ]] && remove+=( $vars[work_dir]/*(DN) ) if (($#remove)); then @@ -30,4 +31,5 @@ fi mkdir -p $vars[changes_dir] $vars[work_dir] $vars[build_dir] \ || die "Failed to create work directories" + # vim: fileencoding=utf8 ft=zsh noet sw=4 ts=4 sts=4