From 8d264397abd36ea832a907f6e88b57f89570cc56 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Wed, 22 May 2024 00:06:31 +0800 Subject: updated --- spm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/spm b/spm index 6bde76f..fcc1c60 100755 --- a/spm +++ b/spm @@ -113,7 +113,7 @@ spm_install() { if [ -f "$SPMDIR/conflict.list" ] && [ ! "$SPM_FORCEINSTALL" ]; then cat "$SPMDIR/conflict.list" | while read -r line; do - p=$(grep $line $PKGDB/* | awk -F : '{print $1}' | head -n1) + p=$(grep -x $line $PKGDB/* | awk -F : '{print $1}' | head -n1) p=${p##*/} echo "${p:-(none)}: $line" done @@ -252,7 +252,10 @@ spm_allinstalled() { spm_listfiles() { checkdbdir needarg $1 - tail -n+2 $PKGDB/$1 + if [ ! -s $PKGDB/$1 ]; then + msgerr "Package '$1' not installed." + fi + tail -n+2 $PKGDB/$1 exit 0 } -- cgit v1.2.3