aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2020-01-28 12:13:26 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2020-01-28 12:13:26 +0000
commit73e1f67e2b377d2f9c0727e279ced5b78c563b0b (patch)
tree7f87386fd16694308f0bad4fd3b57036e73330b8
parent3b8329ca72a48e8e91893566c35e5a463768f758 (diff)
downloadcpt-73e1f67e2b377d2f9c0727e279ced5b78c563b0b.tar.gz
kiss: Fix shellcheck false-positive
FossilOrigin-Name: 3155d5e53f424fc7f1a8ef3859f66011bcce268166727bee23cafba05d4b983c
-rwxr-xr-xkiss12
1 files changed, 6 insertions, 6 deletions
diff --git a/kiss b/kiss
index c7eb6df..6d677ba 100755
--- a/kiss
+++ b/kiss
@@ -795,8 +795,8 @@ pkg_conflicts() {
# this work.
#
# Pretty nifty huh?
- while IFS=: read -r pro bin || [ "$pro" ]; do
- log "$p_name" "Found conflict ($bin), adding choice"
+ while IFS=: read -r pro con || [ "$pro" ]; do
+ log "$p_name" "Found conflict ($con), adding choice"
# Create the "choices" directory inside of the tarball.
# This directory will store the conflicting file.
@@ -804,16 +804,16 @@ pkg_conflicts() {
# Construct the file name of the "db" entry of the
# conflicting file. (pkg_name>usr>bin>ls)
- bin_name=$(echo "$bin" | sed 's|/|>|g')
+ con_name=$(echo "$con" | sed 's|/|>|g')
# Move the conflicting file to the choices directory
# and name it according to the format above.
- mv -f "$tar_dir/$p_name/$bin" \
- "$tar_dir/$p_name/$cho_dir/$p_name$bin_name"
+ mv -f "$tar_dir/$p_name/$con" \
+ "$tar_dir/$p_name/$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|$bin|/$cho_dir/$p_name$bin_name|" \
+ sed -i "s|$con|/$cho_dir/$p_name$con_name|" \
"$tar_dir/$p_name/$pkg_db/$p_name/manifest"
done
}