aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2020-01-28 14:50:11 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2020-01-28 14:50:11 +0000
commit02c335880dc2b19514af9ca70d6cd05f4b656a6a (patch)
tree061d3d5a39670af55c0d0516830374c173b7ee35
parent16dd754c1102b67e7fbdaa80f0390a5926a40a36 (diff)
downloadcpt-02c335880dc2b19514af9ca70d6cd05f4b656a6a.tar.gz
kiss: clean
FossilOrigin-Name: af90c5e2df30a84d2fac915662c40a15a627d46317648ccde3bef2949894be42
-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/" \