[31926] branches/release_1_6/base/portmgr/dmg/postflight

[jmpp at macports.org]

Revision: 31926
          http://trac.macosforge.org/projects/macports/changeset/31926
Author:   jmpp at macports.org
Date:     2007-12-11 22:42:07 -0800 (Tue, 11 Dec 2007)

Log Message:
-----------
Hide some unnecessary output and reduce that of the selfudpate call with -v rather than -d.

Modified Paths:
--------------
    branches/release_1_6/base/portmgr/dmg/postflight

Modified: branches/release_1_6/base/portmgr/dmg/postflight
===================================================================
--- branches/release_1_6/base/portmgr/dmg/postflight	2007-12-12 06:40:20 UTC (rev 31925)
+++ branches/release_1_6/base/portmgr/dmg/postflight	2007-12-12 06:42:07 UTC (rev 31926)
@@ -62,7 +62,7 @@
 # backing up the original only if it exists and if it doesn't contain the $OUR_STRING identification string,
 # which hints that we've already tweaked it and therefore already baked it up.
 function write_setting () {
-    if [ -f $HOME/.$CONF_FILE ] && ! grep "$OUR_STRING" $HOME/.$CONF_FILE; then
+    if [ -f $HOME/.$CONF_FILE ] && ! grep "$OUR_STRING" $HOME/.$CONF_FILE > /dev/null 2>&1; then
         /bin/cp -fp $HOME/.$CONF_FILE "$HOME/.$CONF_FILE.$BACKUP_SUFFIX" || {
             echo "An attempt to backup your original configuration file failed! Please set your MacPorts compatible environment manually."
             exit 1
@@ -109,7 +109,7 @@
 # or if it doesn't already contain our path:
   echo "$ORIGINAL_MANPATH" | grep $MANPAGES > /dev/null 2>&1 || \
 # or if there's no empty component somewhere in the middle of it:
-  echo "$ORIGINAL_MANPATH" | grep :: || \
+  echo "$ORIGINAL_MANPATH" | grep :: > /dev/null 2>&1 || \
 # or at the start of it:
   [ -z "$(echo "$ORIGINAL_MANPATH" | awk -F : '{print $1}')" ] || \
 # or at the end of it:
@@ -123,7 +123,7 @@
 # Update the MacPorts installation through "selfupdate":
 echo -e "\nSynchronizing the MacPorts installation with the project's rsync server...\n"
 export PATH=$BINPATH:$PATH
-port -d selfupdate || {
+port -v selfupdate || {
     echo "An attempt to synchronize your recent MacPorts installation with the project's rsync server failed!"
     echo "Please run 'port -d selfupdate' manually to find out the cause of the error."
     exit 1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071211/5c5deba9/attachment.html