fix conflict option

This commit is contained in:
emmett1
2019-02-04 17:47:02 +08:00
parent 3b132a09f7
commit 659ccd8084

2
pkgadd
View File

@@ -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