scottk/scratchpkg
1
0
Fork 0
mirror of https://github.com/outbackdingo/scratchpkg.git synced 2026-03-20 07:44:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert some features from pkgadd

Browse Source
This commit is contained in:
emmett1
2019-11-09 21:19:01 +08:00
parent a70d936c1d
commit 64dde84a94
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgadd
View File

@@ -227,8 +227,6 @@ if [ ! "$IGNORE_CONFLICT" ]; then
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
owner="$(grep -E ^$line$ $INDEX_DIR/*/.files | sed "s,$INDEX_DIR/,,;s,\/.*,,")"
[ "$owner" ] && owner=\($owner\)
echo "$line $owner"
conflictedfile=yes
fi