kiss-community
/
kiss
mirror of https://codeberg.org/kiss-community/kiss
1
0
Fork 1
Code Issues Wiki

kiss: drop esc()

This commit is contained in:
Dylan Araps 2020-05-16 09:49:05 +03:00
parent d0a45c4437
commit cc0ab4d072
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kiss
View File

@ -58,14 +58,6 @@ as_root() {
esac
}
esc() {
# Escape all required characters in both the search and
# replace portions of two strings for use in a 'sed' call
# as "plain-text".
printf 's/^%s$/%s/' "$(printf %s "$1" | sed 's/[]\/$*.^[]/\\&/g')" \
"$(printf %s "$2" | sed 's/[\/&]/\\&/g')"
}
_tar() {
# Some tar implementations support '-args' and some
# simply support 'args'. This will try '-args' and
@ -967,7 +959,10 @@ pkg_swap() {
# its manifest file to reflect this.
cp -Pf "$KISS_ROOT/$2" "$pkg_owns>${alt#*>}"
sed "$(esc "$2" "${PWD#$KISS_ROOT}/$pkg_owns>${alt#*>}")" \
# The separator is the ASCII unit separator which should
# be safe to use as files should never contain this character
# (I hope to god)..
sed "s^$2$${PWD#$KISS_ROOT}/$pkg_owns>${alt#*>}" \
"../installed/$pkg_owns/manifest" | sort -r > "$mak_dir/.$1"
mv -f "$mak_dir/.$1" "../installed/$pkg_owns/manifest"
@ -977,7 +972,10 @@ pkg_swap() {
# the manifest file to reflect this. The reverse of above.
mv -f "$alt" "$KISS_ROOT/$2"
sed "$(esc "${PWD#$KISS_ROOT}/$alt" "$2")" \
# The separator is the ASCII unit separator which should
# be safe to use as files should never contain this character
# (I hope to god)..
sed "s${PWD#$KISS_ROOT}/$alt$2" \
"../installed/$1/manifest" | sort -r > "$mak_dir/.$1"
mv -f "$mak_dir/.$1" "../installed/$1/manifest"