Xigmanas/xigmanas-bastille-extension
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

Add missing system file to properly compare and merge files upon upgrades

Browse Source
This commit is contained in:
Jose
2021-02-02 05:48:16 -04:00
parent 2a52af52eb
commit 2fd87131f1
5 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bastille-init
View File

@@ -391,6 +391,11 @@ include_files()
install -m 0555 ${SYSTEM_INCLUDE}/sum /usr/bin/sum
fi
fi
if [ ! -f "/usr/bin/diff3" ]; then
if [ -f "${SYSTEM_INCLUDE}/diff3" ]; then
install -m 0555 ${SYSTEM_INCLUDE}/diff3 /usr/bin/diff3
fi
fi
else
sysrc -f ${CWDIR}${EXTCONF} VNET_ENABLE="NO" >/dev/null 2>&1
fi
@@ -932,7 +937,7 @@ remove_addon()
fi
done
BIN_FILES="/usr/local/bin/jib /usr/sbin/setfib /usr/bin/sum /usr/bin/makewhatis"
BIN_FILES="/usr/local/bin/jib /usr/sbin/setfib /usr/bin/sum /usr/bin/diff3"
for FILE in ${BIN_FILES}; do
if [ -f "${FILE}" ]; then
rm -rf ${FILE}