aboutsummaryrefslogtreecommitdiff
path: root/kiss
diff options
context:
space:
mode:
Diffstat (limited to 'kiss')
-rwxr-xr-xkiss4
1 files changed, 2 insertions, 2 deletions
diff --git a/kiss b/kiss
index 4377345..214a037 100755
--- a/kiss
+++ b/kiss
@@ -814,13 +814,13 @@ pkg_conflicts() {
# conflicting file. (pkg_name>usr>bin>ls)
con_name=$(echo "$con" | sed 's|/|>|g')
- regex_escape "$con" "/$cho_dir/$p_name$con_name"
-
# 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"
+ regex_escape "$con" "/$cho_dir/$p_name$con_name"
+
# Rewrite the package's manifest to update its location
# to its new spot (and name) in the choices directory.
sed -i "s/$sea/$rep/" \