mirror of
https://github.com/outbackdingo/scratchpkg.git
synced 2026-02-05 08:28:00 +00:00
fix conflict option
This commit is contained in:
2
pkgadd
2
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
|
||||
|
||||
Reference in New Issue
Block a user