From owner-svn-src-user@FreeBSD.ORG Sun Jan 24 02:10:23 2010 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0D2E1065672; Sun, 24 Jan 2010 02:10:23 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 953B88FC16; Sun, 24 Jan 2010 02:10:23 +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 o0O2AN4j086218; Sun, 24 Jan 2010 02:10:23 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0O2ANY9086216; Sun, 24 Jan 2010 02:10:23 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201001240210.o0O2ANY9086216@svn.freebsd.org> From: Doug Barton Date: Sun, 24 Jan 2010 02:10:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202906 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2010 02:10:23 -0000 Author: dougb Date: Sun Jan 24 02:10:23 2010 New Revision: 202906 URL: http://svn.freebsd.org/changeset/base/202906 Log: Remove the RCS Id stuff since I'm not using that currently, and not likely to go back. Add a --no-confirm option to suppress the new feature of confirming the work to be done before doing it. Tune up the confirmation message. Don't bother confirming if the only thing to be done is the exact work that the user specified on the command line. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Sun Jan 24 01:06:02 2010 (r202905) +++ user/dougb/portmaster/portmaster Sun Jan 24 02:10:23 2010 (r202906) @@ -42,16 +42,14 @@ umask 022 version () { local rcs cvs - rcs='$Id: portmaster,v 2.54 2009/09/15 07:50:11 dougb Exp $' cvs='$FreeBSD$' - rcs="${rcs#*,v }" ; rcs="${rcs%% *}" cvs="${cvs#*,v }" ; cvs="${cvs#*/portmaster }" ; cvs="${cvs%% *}" echo '' [ "${cvs#$}" != 'FreeBSD$' ] && { echo "===>>> Version $cvs" ; return 0; } - echo "===>>> Development version $rcs" + echo "===>>> Version unknown!" } fail () { @@ -242,7 +240,7 @@ usage () { echo "Common flags: [--force-config] [-CGHKgntvw B|b f|i D|d]" echo " [[--packages|--packages-only] [-P|-PP] | [--packages-build]]" echo " [--packages-if-newer] [--delete-build-only] [--always-fetch]" - echo " [--local-packagedir=]" + echo " [--local-packagedir=] [--no-confirm]" echo " [-m ] [-x ]" echo "${0##*/} [Common flags] " echo "${0##*/} [Common flags] " @@ -298,6 +296,8 @@ usage () { echo "-m " echo "-x " echo ' Can be specified more than once' + echo '--no-confirm do not ask user to confirm list of ports to be' + echo ' installed and/or updated before proceeding' echo '' echo '--show-work list what ports are and would be installed' echo '' @@ -436,6 +436,8 @@ for var in "$@" ; do -[A-Za-z0-9]*) newopts="$newopts $var" ;; --delete-build-only) PM_DEL_BUILD_ONLY=pm_dbo export PM_DEL_BUILD_ONLY ;; + --no-confirm) PM_NO_CONFIRM=pm_no_confirm + export PM_NO_CONFIRM ;; --help) usage 0 ;; --version) version ; exit 0 ;; --clean-distfiles) CLEAN_DISTFILES=clean_distfiles ;; @@ -1944,18 +1946,24 @@ create_master_rb_list () { post_config () { local numdeps answer action - [ $num_of_deps -gt 0 ] && numdeps=" (${num_of_deps})" - term_printf "$numdeps" + if [ $num_of_deps -gt 0 ]; then + numdeps=" (${num_of_deps})" + term_printf "$numdeps" - echo '' - echo "===>>> If you choose to proceed, the following will be done:" - echo -e "$build_l" - echo -n "===>>> Proceed? y/n [y] " - read answer - case "$answer" in - [nN]*) safe_exit ;; - esac - unset build_l + if [ -z "$PM_NO_CONFIRM" ]; then + echo '' +echo "===>>> The following actions will be taken if you choose to proceed:" + echo -e "$build_l" + echo -n "===>>> Proceed? y/n [y] " + read answer + case "$answer" in + [nN]*) safe_exit ;; + esac + unset build_l + fi + else + term_printf + fi action=build if [ "$PM_PACKAGES" = only ]; then