[BUG FIX] Self-update was carried out even for commands other than do or prepare.

Concerned bugs of the above bug fix are fixed.

	modified:   portsreinstall
	modified:   portsreinstall.8

diff --git a/portsreinstall b/portsreinstall
index 460baf6..1659ea7 100755 (executable)
--- a/portsreinstall
+++ b/portsreinstall
@@ -10,7 +10,7 @@
 # ================================================
 
 APPNAME=`basename "$0"`
-MYVERSION=2.2.2+toward_2.2.3_20130131040851
+MYVERSION=2.2.2+toward_2.2.3_20130131041824
 
 LOCALBASE=${LOCALBASE:-/usr/local}
 PREFIX=${PREFIX:-${LOCALBASE}}
@@ -1217,7 +1217,7 @@ else
 fi
 
 # Update ports-mgmt/pkg if it is newer in the ports tree
-if [ \( "x${command-do}" = xdo -o "x$command" = xprepare \) \
+if [ \( "x${command:-do}" = xdo -o "x$command" = xprepare \) \
        -a "x$WITH_PKGNG" = xyes -a $supress_pkgng_upadte = no \
        -a `id -u` -eq 0 -a \( ! -e "${DBDIR}" -o ${_STATUS_DB_OBSOLETE} = yes \) \
        -a -x "${LOCALBASE}"/sbin/pkg ]
@@ -1278,7 +1278,7 @@ then
 fi
 
 # Update portsreinstall itself if it is newer in the ports tree
-if [ \( "x${command-do}" = xdo -o "x$command" = xprepare \) \
+if [ \( "x${command:-do}" = xdo -o "x$command" = xprepare \) \
        -a $supress_self_upadte = no -a `id -u` -eq 0 \
        -a \( ! -e "${DBDIR}" -o ${_STATUS_DB_OBSOLETE} = yes \) ]
 then

diff --git a/portsreinstall.8 b/portsreinstall.8
index 2f09701..240c296 100644 (file)
--- a/portsreinstall.8
+++ b/portsreinstall.8
@@ -305,6 +305,8 @@ Configuration file of portupgrade(1).
 [BUG FIX] Inappropriate operations could be attempted on the temporal database by non-superuser privilege.
 
 [BUG FIX] Tarballs for ports which depend on other ports could have been lost in the step of cleaning distfiles.
+
+[BUG FIX] Self-update was carried out even for commands other than do or prepare.
 .TP
 2.2.2 (03 January 2013)
 [BUG FIX] Commands \fBok add\fR and \fBok del\fR failed if no port has reinstalled in the latest do/redo process.