This commit is contained in:
emmett1
2018-11-02 17:28:39 +08:00
parent 5139277ac2
commit bd5af7c91b
2 changed files with 13 additions and 8 deletions

2
pkgadd
View File

@@ -327,7 +327,7 @@ $installcmd | while IFS=' ' read line; do
echo "$line" >> $TMP_PKGINSTALL_BKP
line=${line%.*}
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
if [ ! -e "$ROOT/$line" ]; then
if [ ! -e "$ROOT/$line" ] || [ "$NO_BACKUP" = yes ]; then
mv "$ROOT/$line".spkgnew "$ROOT/$line"
fi
else

19
scratch
View File

@@ -598,13 +598,18 @@ outdatepkg() {
}
sysup() {
local d UPGPKG NEWPKG PKGOUTDATE
local d UPGPKG NEWPKG PKGOUTDATE OPTS
needroot "Upgrading package"
if [ "$1" = "--no-confirm" ]; then
NOCONFIRM=1
fi
while [ "$1" ]; do
if [ "$1" = "--no-confirm" ]; then
NOCONFIRM=1
elif [ "$1" = "--no-backup" ]; then
OPTS+=($1)
fi
shift
done
PKGOUTDATE=$(outdatepkg)
@@ -646,9 +651,9 @@ sysup() {
. $BUILD_SCRIPT
echo -en "\033]0;($count/$total) $name-$version-$release \a"
if [ ! -e "$INDEX_DIR/$inst/.pkginfo" ]; then
pkgbuild -is || exit 1
pkgbuild -is ${OPTS[@]} || exit 1
else
pkgbuild -us || exit 1
pkgbuild -us ${OPTS[@]} || exit 1
fi
done
@@ -1104,7 +1109,7 @@ main() {
fi
if [ "$mode" = "sysup" ]; then
sysup $1
sysup $@
exit 0
fi