From e2c62f10999af8c80a65b1b8d54a77f1e29a36be Mon Sep 17 00:00:00 2001 From: emmett1 Date: Thu, 26 Jun 2025 07:33:15 +0800 Subject: fix spm -r --- spm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spm b/spm index 9e74b3c..57447e5 100755 --- a/spm +++ b/spm @@ -269,9 +269,9 @@ spm_remove() { # list all dirs except for target pkg grep /$ $PKGDB/* | grep -v /$1: | awk -F : '{print $2}' | sort | uniq > $SPMDIR/remove.all - grep /$ $PKGDB/* | grep /$1: | awk -F : '{print $2}' | sort | uniq > $SPMDIR/remove.target - grep -Fxv -f $SPMDIR/remove.all $SPMDIR/remove.target > $SPMDIR/remove.rmlist - rmdir $VERBOSE $(sort $SPMDIR/remove.rmlist | tac) + grep /$ $PKGDB/* | grep /$1: | awk -F : '{print $2}' | sort | uniq > $SPMDIR/remove.target + grep -Fxv -f $SPMDIR/remove.all $SPMDIR/remove.target | sort | tac > $SPMDIR/remove.rmlist + [ -s $SPMDIR/remove.rmlist ] && rmdir $VERBOSE $(sort $SPMDIR/remove.rmlist | tac) rm -f $PKGDB/$1 $PERMDIR/$1 $OWNDIR/$1 $SPMDIR/remove.* msg "Package '$1' removed." @@ -331,7 +331,11 @@ if [ "$SPM_ROOT" ]; then SPM_ROOT=$(realpath $SPM_ROOT) fi -[ "$SPM_VERBOSE" ] && VERBOSE=-v +if [ "$SPM_VERBOSE" ]; then + VERBOSE=-v +else + VERBOSE= +fi HERE=$PWD SPMDIR=$SPM_ROOT/var/lib/spm -- cgit v1.2.3