From: Nathan Wagner Date: Sat, 11 Aug 2018 02:41:43 +0000 (+0000) Subject: get correct count of changed and removed files X-Git-Tag: v0.1.6~66 X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=c751531488060b262433bb0d5a93750e321e80db get correct count of changed and removed files --- diff --git a/zpm-install b/zpm-install index 1886cf1..173ff1b 100755 --- a/zpm-install +++ b/zpm-install @@ -214,13 +214,22 @@ do_upgrade() { zpm pkg $newver status installing echo newfiles - newfiles $newver $oldver | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $nver + newct=$(newfiles | wc -l) + if [ $newct -gt 0 ]; then + newfiles $newver $oldver | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $nver + fi echo changed - changedfiles $newver $oldver | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $pkg + ct=$(changedfiles | wc -l) + if [ $ct -gt 0 ]; then + changedfiles $newver $oldver | xargs zpm ipkgfile ${user+-u $user} ${group+-g $group} -R "$pkgroot" -f $pkgfile -- $pkg + fi echo removed - removedfiles $newver $oldver | xargs rm + ct=$(removedfiles | wc -l) + if [ $ct -gt 0 ]; then + removedfiles $newver $oldver | xargs rm + fi zpm pkg $newver status installed zpm pkg $oldver status upgraded