bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: Simplify regex escape

Browse Source
This commit is contained in:
Dylan Araps 2020-02-03 11:11:16 +02:00
parent 9b19bc0fab
commit 767e414447
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kiss
View File

@ -56,16 +56,17 @@ as_root() {
case $su in case $su in
*sudo) sudo -Eu "${user:-root}" -- "$@" ;; *sudo) sudo -Eu "${user:-root}" -- "$@" ;;
*doas) doas -u "${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 esac
} }
regex_escape() { esc() {
# Escape all required characters in both the search and # Escape all required characters in both the search and
# replace portions of two strings for use in a 'sed' call # replace portions of two strings for use in a 'sed' call
# as "plain-text". # as "plain-text".
sea=$(printf %s "$1" | sed 's/[]\/$*.^[]/\\&/g') printf 's/^%s$/%s/' \
rep=$(printf %s "$2" | sed 's/[\/&]/\\&/g') "$(printf %s "$1" | sed 's/[]\/$*.^[]/\\&/g')" \
"$(printf %s "$2" | sed 's/[\/&]/\\&/g')"
} }
pkg_lint() { pkg_lint() {
@ -736,11 +737,10 @@ pkg_conflicts() {
"$tar_dir/$p_name/$cho_dir/$p_name$con_name" 2>/dev/null || "$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" 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 # Rewrite the package's manifest to update its location
# to its new spot (and name) in the choices directory. # 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 done
else else
if "$grep" -Fxf "$cac_dir/$pid-m" -- "$@"; then if "$grep" -Fxf "$cac_dir/$pid-m" -- "$@"; then
@ -781,20 +781,17 @@ pkg_swap() {
log "Swapping '$2' from '$pkg_owns' to '$1'" log "Swapping '$2' from '$pkg_owns' to '$1'"
regex_escape "$2" "$PWD/$pkg_owns>${alt#*>}"
# Convert the current owner to an alternative and rewrite # Convert the current owner to an alternative and rewrite
# its manifest file to reflect this. # its manifest file to reflect this.
cp -f "$2" "$pkg_owns>${alt#*>}" 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 fi
regex_escape "$PWD/$alt" "$2"
# Convert the desired alternative to a real file and rewrite # Convert the desired alternative to a real file and rewrite
# the manifest file to reflect this. The reverse of above. # the manifest file to reflect this. The reverse of above.
mv -f "$alt" "$2" mv -f "$alt" "$2"
sed -i "s/^$sea\$/$rep/" "../installed/$1/manifest" sed -i "$(esc "$PWD/$alt" "$2")" "../installed/$1/manifest"
} }
pkg_remove() { pkg_remove() {