From 5e95d5c02dee39e9e083462ca1b216ee946c6b63 Mon Sep 17 00:00:00 2001
From: "dylan.araps@gmail.com" <dylan.araps@gmail.com>
Date: Wed, 20 Nov 2019 14:26:07 +0000
Subject: kiss: resolve symlinks in package conflict check.

FossilOrigin-Name: 8a227caf7afa7cbb3690e5d00842f487c34874e46204a40ae0723d0a0f012855
---
 kiss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'kiss')

diff --git a/kiss b/kiss
index 056a56f..bab4b43 100755
--- a/kiss
+++ b/kiss
@@ -579,7 +579,11 @@ pkg_conflicts() {
     # exist in the filesystem. It's pointless to check for conflicts
     # with files which don't presently exist.
     tar xf "$1" -O "./$pkg_db/$2/manifest" | while read -r file; do
-        [ -f "$KISS_ROOT/$file" ] && printf '%s\n' "$file"
+        [ -f "$KISS_ROOT/$file" ] && {
+            printf '%s\n' "$file"
+
+            (cd "$KISS_ROOT/"; readlink -f "./$file")
+        }
     done |
 
     # Filter the existing file list through the manifest of the
@@ -588,9 +592,10 @@ pkg_conflicts() {
 
     # If the generated manifest contains matches, check the
     # contents for conflicts.
-    [ -s "$cac_dir/$pid-m" ] &&
+    if [ -s "$cac_dir/$pid-m" ]; then
         grep -Fxf "$cac_dir/$pid-m" -- "$sys_db"/*/manifest &&
             die "Package '$2' conflicts with another package"
+    fi
 
     set -ef
 }
-- 
cgit v1.2.3