zawz/zpkg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove double log on self-upgrade

Browse source
This commit is contained in:
zawz 2020-07-02 12:29:02 +02:00
parent 15987f688a
commit 10b364e560
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/env.sh
View file

@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
_OUTPUT=/dev/stdin
[ "$_ZPKG_SELF_UPGRADE" = "y" ] && _OUTPUT=/dev/null
config_path=/etc/zpkg config_path=/etc/zpkg
fname="$(basename "$0")" fname="$(basename "$0")"
ALLOW_ROOT=false ALLOW_ROOT=false

6
src/main.sh
View file

@ -55,7 +55,7 @@ info)
fi fi
;; ;;
install) install)
fetch_pkglist $sudo || exit $? fetch_pkglist $sudo > $_OUTPUT || exit $?
if [ -z "$2" ] if [ -z "$2" ]
then then
echo "No package specified" >&2 echo "No package specified" >&2
@ -63,7 +63,7 @@ install)
shift 1 shift 1
pkglist=$(LOG=true resolve_packages $*) || exit $? pkglist=$(LOG=true resolve_packages $*) || exit $?
pkglist=$(INCLUDE_PACKAGES=true resolve_deps $* | tr '\n' ' ') pkglist=$(INCLUDE_PACKAGES=true resolve_deps $* | tr '\n' ' ')
echo "Installing packages: $pkglist" echo "Installing packages: $pkglist" > $_OUTPUT
for I in $pkglist for I in $pkglist
do do
if is_installed $I if is_installed $I
@ -133,4 +133,4 @@ deploy)
*) usage && exit 1 ;; *) usage && exit 1 ;;
esac esac
[ -n "$_self_update" ] && gen_self_update && exec "$_tmpzpkg" -R install zpkg [ -n "$_self_update" ] && gen_self_update && _ZPKG_SELF_UPGRADE=y exec "$_tmpzpkg" -R install zpkg

2
src/upgrade.sh
View file

@ -41,9 +41,9 @@ upgrade_package()
## self upgrading mitigation ## self upgrading mitigation
unset _self_update unset _self_update
_tmpzpkg="/tmp/zpkg_bin_$(random_string 5)"
gen_self_update() gen_self_update()
{ {
_tmpzpkg="/tmp/zpkg_bin_$(random_string 5)"
# copy current file # copy current file
cp "$0" "$_tmpzpkg" || return $? cp "$0" "$_tmpzpkg" || return $?
# make new script self-delete # make new script self-delete