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

kiss: avoid sed -i

Browse Source
This commit is contained in:
Dylan Araps 2020-01-28 23:06:20 +02:00
parent a2fea3d9a6
commit ea9dc1278a
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kiss
View File

@ -826,11 +826,12 @@ pkg_conflicts() {
"$tar_dir/$p_name/$cho_dir/$p_name$con_name" "$tar_dir/$p_name/$cho_dir/$p_name$con_name"
regex_escape "$con" "/$cho_dir/$p_name$con_name" regex_escape "$con" "/$cho_dir/$p_name$con_name"
mani=$tar_dir/$p_name/$pkg_db/$p_name/manifest
# 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/" \ sed "s/^$sea\$/$rep/" "$mani" > "$mani.1"
"$tar_dir/$p_name/$pkg_db/$p_name/manifest" mv -f "$mani.1" "$mani"
done done
else else
if "$grep" -Fxf "$cac_dir/$pid-m" -- "$@"; then if "$grep" -Fxf "$cac_dir/$pid-m" -- "$@"; then
@ -872,19 +873,23 @@ 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#*>}" regex_escape "$2" "$PWD/$pkg_owns>${alt#*>}"
mani=${PWD%/*}/installed/$pkg_owns/manifest
# 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.
dosu cp -f "'$2'" "'$pkg_owns>${alt#*>}'" dosu cp -f "'$2'" "'$pkg_owns>${alt#*>}'"
dosu sed -i "'s/^$sea\$/$rep/'" "'../installed/$pkg_owns/manifest'" dosu sed "'s/^$sea\$/$rep/'" \
"'$mani' > '$mani.1' && mv -f '$mani.1' '$mani'"
fi fi
regex_escape "$PWD/$alt" "$2" regex_escape "$PWD/$alt" "$2"
mani=${PWD%/*}/installed/$1/manifest
# 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.
dosu mv -f "'$alt'" "'$2'" dosu mv -f "'$alt'" "'$2'"
dosu sed -i "'s/^$sea\$/$rep/'" "'../installed/$1/manifest'" dosu sed "'s/^$sea\$/$rep/'" \
"'$mani' > '$mani.1' && mv -f '$mani.1' '$mani'"
} }
pkg_remove() { pkg_remove() {