aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ankarström <john@ankarstrom.se>2021-07-20 22:18:23 +0200
committerJohn Ankarström <john@ankarstrom.se>2021-07-20 22:19:54 +0200
commitd825a4995fa8e663688fb106d02d14759cf58906 (patch)
treece693413986c98ef47937c5ef424f57df343cd12
parentece5542bbe560370db73fec93b56c0f4a799beb8 (diff)
downloadpatches-d825a4995fa8e663688fb106d02d14759cf58906.tar.gz
Fix psu
-rwxr-xr-xpsu2
-rwxr-xr-xpsx6
2 files changed, 4 insertions, 4 deletions
diff --git a/psu b/psu
index 3f192bd..a5ad636 100755
--- a/psu
+++ b/psu
@@ -2,7 +2,7 @@
# psu -- undo patches applied to pkgsrc build
-d=$(psx)
+d=$(psx) || true
echo=echo
echo "${0##*/}: undoing patches..." 1>&2
[ x"$1" = x"-x" ] && echo= || echo '(preview, no -x)' 1>&2
diff --git a/psx b/psx
index c0df08f..1066c5f 100755
--- a/psx
+++ b/psx
@@ -13,8 +13,8 @@ d=$(tar -tf "$f" | head -1)
opt=
if [ -e "$d" ]; then
- printf "%s: $d already exists; overwrite? " "${0##*/}"
- read ans
+ printf "%s: $d already exists; overwrite? " "${0##*/}" 1>&2
+ read ans </dev/tty
case $ans in
y*) opt=-U ;;
*) exit 1 ;;
@@ -22,5 +22,5 @@ if [ -e "$d" ]; then
fi
echo extracting archive... 1>&2
-tar -x $opt -f "$f"
+tar -x $opt -f "$f" 1>&2
echo "$d"