From owner-svn-src-stable@FreeBSD.ORG  Sat Jan 29 08:14:47 2011
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8D963106564A;
	Sat, 29 Jan 2011 08:14:47 +0000 (UTC)
	(envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7DC1D8FC15;
	Sat, 29 Jan 2011 08:14:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0T8ElNW023550;
	Sat, 29 Jan 2011 08:14:47 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0T8ElWG023548;
	Sat, 29 Jan 2011 08:14:47 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201101290814.p0T8ElWG023548@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Sat, 29 Jan 2011 08:14:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218060 - stable/8/usr.sbin/portsnap/portsnap
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Jan 2011 08:14:48 -0000

Author: alfred
Date: Sat Jan 29 08:14:47 2011
New Revision: 218060
URL: http://svn.freebsd.org/changeset/base/218060

Log:
  MFC: 'alfred' command.

Modified:
  stable/8/usr.sbin/portsnap/portsnap/portsnap.sh

Modified: stable/8/usr.sbin/portsnap/portsnap/portsnap.sh
==============================================================================
--- stable/8/usr.sbin/portsnap/portsnap/portsnap.sh	Sat Jan 29 07:22:33 2011	(r218059)
+++ stable/8/usr.sbin/portsnap/portsnap/portsnap.sh	Sat Jan 29 08:14:47 2011	(r218060)
@@ -140,7 +140,7 @@ parse_cmdline() {
 			if [ ! -z "${SERVERNAME}" ]; then usage; fi
 			shift; SERVERNAME="$1"
 			;;
-		cron | extract | fetch | update)
+		cron | extract | fetch | update | alfred)
 			COMMANDS="${COMMANDS} $1"
 			;;
 		*)
@@ -1040,6 +1040,22 @@ cmd_update() {
 	update_run || exit 1
 }
 
+# Alfred command.  Run 'fetch' or 'cron' depending on
+# whether stdin is a terminal; then run 'update' or
+# 'extract' depending on whether ${PORTSDIR} exists.
+cmd_alfred() {
+    if [ -t 0 ]; then
+	cmd_fetch
+    else
+	cmd_cron
+    fi
+    if [ -d ${PORTSDIR} ]; then
+	cmd_update
+    else
+	cmd_extract
+    fi
+}
+
 #### Entry point
 
 # Make sure we find utilities from the base system