Skip to content

Commit

Permalink
kiss: Use suggested primary
Browse files Browse the repository at this point in the history
FossilOrigin-Name: a773ef662dcbda3708928d8f16b732c7ee3779ed4f5e311cf30b5f6320c27ead
  • Loading branch information
cemkeylan committed Apr 26, 2020
1 parent 53d992c commit fe37334
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions kiss
Original file line number Diff line number Diff line change
Expand Up @@ -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%/*}"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fe37334

Please sign in to comment.