From dbaedc1d2060764a004ef9d0263689833cf4a8c7 Mon Sep 17 00:00:00 2001
From: "dylan.araps@gmail.com" <dylan.araps@gmail.com>
Date: Sat, 1 Feb 2020 08:20:41 +0000
Subject: kiss: show error message on mv fail. Closes #103

FossilOrigin-Name: 0429e0b3d21b2b516118377e84052ff5d72a834c6c785a57401513ba33e28a95
---
 kiss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kiss b/kiss
index 54ee9f8..3b7e318 100755
--- a/kiss
+++ b/kiss
@@ -733,7 +733,8 @@ pkg_conflicts() {
             # Move the conflicting file to the choices directory
             # and name it according to the format above.
             mv -f "$tar_dir/$p_name/$con" \
-                  "$tar_dir/$p_name/$cho_dir/$p_name$con_name"
+                  "$tar_dir/$p_name/$cho_dir/$p_name$con_name" 2>/dev/null ||
+                  die "File must be in ${con%/*} and not a symlink to it"
 
             regex_escape "$con" "/$cho_dir/$p_name$con_name"
 
-- 
cgit v1.2.3