From 659ccd80840c6be431da485746e03d80cd89c40d Mon Sep 17 00:00:00 2001 From: emmett1 Date: Mon, 4 Feb 2019 17:47:02 +0800 Subject: [PATCH] fix conflict option --- pkgadd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgadd b/pkgadd index a7755a8..319a6e8 100755 --- a/pkgadd +++ b/pkgadd @@ -262,10 +262,10 @@ if [ ! "$IGNORE_CONFLICT" ]; then done < <(cat $TMP_PKGADD | grep -Ev '(.pkginfo|.pkginstall|.pkgreadme)' | grep -v '/$') if [ "${#fileconflict[@]}" -gt 0 ]; then - msgerr "File conflict found:" for fc in ${fileconflict[@]}; do echo "$fc" done + msgerr "File conflict found!" ret 1 fi fi