aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordylan.araps@gmail.com <dylan.araps@gmail.com>2020-02-03 09:11:15 +0000
committerdylan.araps@gmail.com <dylan.araps@gmail.com>2020-02-03 09:11:15 +0000
commita885e89ebe87db5f8a4655f8e060887b57de77c8 (patch)
treedb56d0ea6fc930232481eca29122ae57124787db
parent69ca7e97739e81a40624092de9e980f3bde3a14c (diff)
downloadcpt-a885e89ebe87db5f8a4655f8e060887b57de77c8.tar.gz
kiss: Simplify regex escape
FossilOrigin-Name: 88b00aa72446b8810655a206ad9b53400a3b541cf391a287a981518a3db4e458
-rwxr-xr-xkiss23
1 files changed, 10 insertions, 13 deletions
diff --git a/kiss b/kiss
index f776feb..6312556 100755
--- a/kiss
+++ b/kiss
@@ -56,16 +56,17 @@ as_root() {
case $su in
*sudo) sudo -Eu "${user:-root}" -- "$@" ;;
*doas) doas -u "${user:-root}" -- "$@" ;;
- *) su -pc "$* <&3" "${user:-root}" 3<&0 </dev/tty ;;
+ *) su -pc "$* <&3" "${user:-root}" 3<&0 </dev/tty ;;
esac
}
-regex_escape() {
+esc() {
# Escape all required characters in both the search and
# replace portions of two strings for use in a 'sed' call
# as "plain-text".
- sea=$(printf %s "$1" | sed 's/[]\/$*.^[]/\\&/g')
- rep=$(printf %s "$2" | sed 's/[\/&]/\\&/g')
+ printf 's/^%s$/%s/' \
+ "$(printf %s "$1" | sed 's/[]\/$*.^[]/\\&/g')" \
+ "$(printf %s "$2" | sed 's/[\/&]/\\&/g')"
}
pkg_lint() {
@@ -736,11 +737,10 @@ pkg_conflicts() {
"$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"
-
# Rewrite the package's manifest to update its location
# to its new spot (and name) in the choices directory.
- sed -i "s/^$sea\$/$rep/" "$tar_dir/$p_name/$pkg_db/$p_name/manifest"
+ sed -i "$(esc "$con" "/$cho_dir/$p_name$con_name")" \
+ "$tar_dir/$p_name/$pkg_db/$p_name/manifest"
done
else
if "$grep" -Fxf "$cac_dir/$pid-m" -- "$@"; then
@@ -781,20 +781,17 @@ pkg_swap() {
log "Swapping '$2' from '$pkg_owns' to '$1'"
- regex_escape "$2" "$PWD/$pkg_owns>${alt#*>}"
-
# Convert the current owner to an alternative and rewrite
# its manifest file to reflect this.
cp -f "$2" "$pkg_owns>${alt#*>}"
- sed -i "s/^$sea\$/$rep/" "../installed/$pkg_owns/manifest"
+ sed -i "$(esc "$2" "$PWD/$pkg_owns>${alt#*>}")" \
+ "../installed/$pkg_owns/manifest"
fi
- regex_escape "$PWD/$alt" "$2"
-
# Convert the desired alternative to a real file and rewrite
# the manifest file to reflect this. The reverse of above.
mv -f "$alt" "$2"
- sed -i "s/^$sea\$/$rep/" "../installed/$1/manifest"
+ sed -i "$(esc "$PWD/$alt" "$2")" "../installed/$1/manifest"
}
pkg_remove() {