aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormerakor <cem@ckyln.com>2020-04-26 22:07:20 +0000
committermerakor <cem@ckyln.com>2020-04-26 22:07:20 +0000
commitfe3733419e07737bf829fbeba635f8993506d578 (patch)
treeb847e215a9a66e4909a4bd91fde82c6689722de9
parent53d992c5ceec0eca55379d584e9c2092cb9b6fc6 (diff)
downloadcpt-fe3733419e07737bf829fbeba635f8993506d578.tar.gz
kiss: Use suggested primary
FossilOrigin-Name: a773ef662dcbda3708928d8f16b732c7ee3779ed4f5e311cf30b5f6320c27ead
-rwxr-xr-xkiss8
1 files changed, 4 insertions, 4 deletions
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