From 91fef535984f0f9be6223fc3f1243c4934f63403 Mon Sep 17 00:00:00 2001 From: Jaden Weiss Date: Tue, 7 Nov 2017 18:47:30 -0500 Subject: [PATCH] fix bugs --- inst.sh | 4 ++-- lpkg.sh | 2 +- rm.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inst.sh b/inst.sh index 8cad1f1..412e01e 100755 --- a/inst.sh +++ b/inst.sh @@ -71,7 +71,7 @@ if [ -e "$dbd" ]; then update=1 echo "Replacing $NAME-$(cat "$dbd/version") with $NAME-$VERSION" - tdel=$(grep -xFvf <(scanlists) "$tmpdir/.files.list") + tdel=$(scanlists | grep -xFvf - "$tmpdir/.files.list") if [ $? -gt 1 ]; then fail "Error searching for files to delete" 2 fi @@ -130,7 +130,7 @@ fi # delete old files (if applicable) if [ $update -eq 1 ]; then if [ ! -z "$tdel" ]; then - rm -r $tdel || fail "Failed to delete old files" 3 + rm -rf $tdel || fail "Failed to delete old files" 3 fi fi diff --git a/lpkg.sh b/lpkg.sh index 89346df..dd07be8 100755 --- a/lpkg.sh +++ b/lpkg.sh @@ -231,7 +231,7 @@ elif [ "$1" == "install" ]; then pins=$(cat "$LPKGDIR/pins.list") || fail "Failed to read pin list" 2 transact $pins $@ || fail "Transaction failed" 3 for i in $@; do - if ! contains $i $@; then + if ! contains $i $pins; then echo $i >> "$LPKGDIR/pins.list" fi done diff --git a/rm.sh b/rm.sh index 8405baf..97440d7 100755 --- a/rm.sh +++ b/rm.sh @@ -53,7 +53,7 @@ scanlists() { done } -tdel=$(grep -xFvf <(scanlists) "$dbd/files.list") +tdel=$(scanlists | grep -xFvf - "$dbd/files.list") if [ $? -gt 1 ]; then fail "Error searching for files to delete" 2 fi @@ -62,7 +62,7 @@ if [ -e "$dbd/hook" ]; then "$dbd/hook" remove || fail "Removal hook returned error code $?" 3 fi -rm -r $tdel || fail "Failed to delete files" 3 +rm -rf $tdel || fail "Failed to delete files" 3 rm -r "$dbd" || fail "Failed to remove database entry" 3 rm -rf "$LPKGDIR/lpkg.lock"