From 5ddac85ea1a2773643e54df4eb37d15a7eb9d304 Mon Sep 17 00:00:00 2001 From: "dylan.araps@gmail.com" Date: Thu, 30 Jan 2020 09:15:34 +0000 Subject: kiss: Revert to sed -i FossilOrigin-Name: 414847d802196703247150b73f6183f2d4403f9df96e292d24a7664c414426ec --- kiss | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'kiss') diff --git a/kiss b/kiss index 90db137..c282444 100755 --- a/kiss +++ b/kiss @@ -737,12 +737,11 @@ pkg_conflicts() { "$tar_dir/$p_name/$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 + mani= # Rewrite the package's manifest to update its location # to its new spot (and name) in the choices directory. - sed "s/^$sea\$/$rep/" "$mani" > "$mani.1" - mv -f "$mani.1" "$mani" + sed -i "s/^$sea\$/$rep/" "$tar_dir/$p_name/$pkg_db/$p_name/manifest" done else if "$grep" -Fxf "$cac_dir/$pid-m" -- "$@"; then @@ -789,8 +788,7 @@ pkg_swap() { # Convert the current owner to an alternative and rewrite # its manifest file to reflect this. cp -f "$2" "$pkg_owns>${alt#*>}" - sed "s/^$sea\$/$rep/" "$mani" > "$mani.1" - mv -f "$mani.1" "$mani" + sed -i "s/^$sea\$/$rep/" "../installed/$pkg_owns/manifest" fi regex_escape "$PWD/$alt" "$2" @@ -799,8 +797,7 @@ pkg_swap() { # 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 "s/^$sea\$/$rep/" "$mani" > "$mani.1" - mv -f "$mani.1" "$mani" + sed -i "s/^$sea\$/$rep/" "../installed/$1/manifest" } pkg_remove() { -- cgit v1.2.3