From 2cb1346f915860d6da0695207dc559ad601462a6 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Tue, 11 Feb 2020 10:04:44 +0000 Subject: kiss: more helpful message FossilOrigin-Name: 89abdb41e95f098453ca7c85107f10e40cdfcc9f351cfc9f4a05e4f94636def6 --- kiss | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kiss b/kiss index f5fea06..044966a 100755 --- a/kiss +++ b/kiss @@ -769,8 +769,14 @@ 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" 2>/dev/null || - die "File must be in ${con%/*} and not a symlink to it" + "$tar_dir/$p_name/$cho_dir/$p_name$con_name" 2>/dev/null || { + log "File must be in ${con%/*} and not a symlink to it" + log "This usually occurs when a binary is installed to" + log "/sbin instead of /usr/bin (example)" + log "Before this package can be used as an alternative," + log "this must be fixed in $p_name. Contact the maintainer" + die "by checking 'git log' or by running 'kiss-maintainer'" + } # Rewrite the package's manifest to update its location # to its new spot (and name) in the choices directory. -- cgit v1.2.3