From d573d52e50bf13666596783282dbdebafc8aeaae Mon Sep 17 00:00:00 2001 From: emmett1 Date: Sat, 15 Jun 2019 15:41:07 +0800 Subject: [PATCH] fix again --- pkgadd | 4 ++-- pkgdel | 2 +- pkglibdepends | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgadd b/pkgadd index 4169a27..27ecae0 100755 --- a/pkgadd +++ b/pkgadd @@ -229,7 +229,7 @@ if [ ! "$IGNORE_CONFLICT" ]; then fi if [ -e "$ROOT_DIR/$line" ] || [ -L "$ROOT_DIR/$line" ]; then if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then - if ! grep -Fx "$line" "$INDEX_DIR/$name/.files"; then + if [ ! "$(grep -Fx "$line" "$INDEX_DIR/$name/.files")" ]; then echo "$line" conflictedfile=yes fi @@ -284,7 +284,7 @@ if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then rm "$ROOT_DIR/$line" &>/dev/null done grep '/$' $TMP_PKGADD_RMLIST | tac | while read -r line; do - if ! grep -Rqx "$line" "$INDEX_DIR"/*/.files | grep -v "$INDEX_DIR"/$name/.files; then + if [ ! "$(grep -Rx "$line" "$INDEX_DIR"/*/.files | grep -v "$INDEX_DIR"/$name/.files)" ]; then [ "$VERBOSE_INSTALL" = yes ] && echo "- $line" rmdir "$ROOT_DIR/$line" &>/dev/null fi diff --git a/pkgdel b/pkgdel index 5bf4845..63e433c 100755 --- a/pkgdel +++ b/pkgdel @@ -175,7 +175,7 @@ while read -r line; do done < <(tac $INDEX_DIR/$name/.files | grep -v '/$') while read -r line; do - if grep -Rqx "$line" "$INDEX_DIR"/*/.files | grep -v "$INDEX_DIR"/$name/.files; then + if [ ! "$(grep -Rx "$line" "$INDEX_DIR"/*/.files | grep -v "$INDEX_DIR"/$name/.files)" ]; then if [ -d "$ROOT_DIR/$line" ]; then [ "$VERBOSE_REMOVE" = yes ] && echo "- $line" rmdir "$ROOT_DIR/$line" diff --git a/pkglibdepends b/pkglibdepends index ce2e96c..eca38d7 100755 --- a/pkglibdepends +++ b/pkglibdepends @@ -54,7 +54,7 @@ pushd / >/dev/null libpath=$(ldd "$LINE" | grep -v "not found" | grep -w "$i" | awk '{print $3}') if [ "$libpath" ]; then FILEPATH=$(readlink -f $libpath) - FILENAME=$(sed -e '1s/^.//' $FILEPATH) + FILENAME=$(echo $FILEPATH | sed -e '1s/^.//') PKG_NAME=$(basename $(dirname $(grep -Rx $FILENAME $INDEX_DIR | cut -d ':' -f1))) if [ "$PKG_NAME" != $1 ]; then if ! echo "$deppkg" | grep -qw "$PKG_NAME"; then