From fe3733419e07737bf829fbeba635f8993506d578 Mon Sep 17 00:00:00 2001 From: merakor Date: Sun, 26 Apr 2020 22:07:20 +0000 Subject: kiss: Use suggested primary FossilOrigin-Name: a773ef662dcbda3708928d8f16b732c7ee3779ed4f5e311cf30b5f6320c27ead --- kiss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kiss') diff --git a/kiss b/kiss index 5be7dc7..616c168 100755 --- a/kiss +++ b/kiss @@ -871,7 +871,7 @@ pkg_install_files() { install -o root -g root -m "$rwx" \ -d "$KISS_ROOT/$line" ;; *) test "$1" "$KISS_ROOT/$line" || - if [ -L "$2/$line" ]; then + if [ -h "$2/$line" ]; then [ -d "$KISS_ROOT/$line" ] && continue cp -fPp "$2/$line" "${line%/*}" @@ -1021,7 +1021,7 @@ pkg_install() { [ -z "$KISS_FORCE" ] && log "$pkg_name" "Checking package manifest" && while read -r line; do # Skip symbolic links - [ -L "$tar_dir/$pkg_name/$line" ] && continue + [ -h "$tar_dir/$pkg_name/$line" ] && continue [ -e "$tar_dir/$pkg_name/$line" ] || { log "File $line missing from tarball but mentioned in manifest" "" "!>" TARBALL_FAIL=1 @@ -1081,11 +1081,11 @@ pkg_install() { rm -f "$file" # Remove file symlinks. - elif [ -L "$file" ] && [ ! -d "$file" ]; then + elif [ -h "$file" ] && [ ! -d "$file" ]; then unlink "$file" ||: # Skip directory symlinks. - elif [ -L "$file" ] && [ -d "$file" ]; then : + elif [ -h "$file" ] && [ -d "$file" ]; then : # Remove directories if empty. elif [ -d "$file" ]; then -- cgit v1.2.3