From owner-svn-src-user@FreeBSD.ORG Fri Jan 15 00:41:47 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 318AE1065672; Fri, 15 Jan 2010 00:41:47 +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 147A98FC15; Fri, 15 Jan 2010 00:41: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 o0F0fk39094968; Fri, 15 Jan 2010 00:41:46 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0F0fks8094967; Fri, 15 Jan 2010 00:41:46 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201001150041.o0F0fks8094967@svn.freebsd.org> From: Doug Barton Date: Fri, 15 Jan 2010 00:41:46 +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: r202325 - 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: Fri, 15 Jan 2010 00:41:47 -0000 Author: dougb Date: Fri Jan 15 00:41:46 2010 New Revision: 202325 URL: http://svn.freebsd.org/changeset/base/202325 Log: Hopefully this time the yes/no options will be more clear, while still maintaining the [default] notation that portmaster users are familiar with. Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Thu Jan 14 23:27:23 2010 (r202324) +++ user/dougb/portmaster/portmaster Fri Jan 15 00:41:46 2010 (r202325) @@ -571,7 +571,7 @@ IFS=' echo " ===>>> but there is no installed version" echo '' if [ -n "$CHECK_DEPENDS" ]; then - echo -n " ===>>> Delete this dependency data? y/[n] " + echo -n " ===>>> Delete this dependency data? y/n [n] " read answer case "$answer" in [yY]) unset prev_line line ; continue ;; @@ -778,7 +778,7 @@ if [ -n "$CLEAN_DISTFILES" ]; then echo "===>>> Deleting $f" pm_unlink $df else - echo -n "===>>> Delete stale file: ${f}? n/[y] " + echo -n "===>>> Delete stale file: ${f}? y/n [y] " read answer case "$answer" in [nN]*) continue ;; @@ -886,7 +886,7 @@ if [ -n "$CHECK_PORT_DBDIR" ]; then *) [ -n "$PM_VERBOSE" ] && echo '' echo '' echo " ===>>> $dbdir does not seem to be installed" - echo -n " ===>>> Delete ${dir}? y/[n] " + echo -n " ===>>> Delete ${dir}? y/n [n] " read answer case "$answer" in [yY]) pm_rm_s -rf $dir ;; @@ -1267,7 +1267,7 @@ find_and_delete_distfiles () { continue fi - echo -n "===>>> Delete $file? y/[n] " + echo -n "===>>> Delete $file? y/n [n] " read answer case "$answer" in [yY]) pm_unlink $file ;; @@ -1347,7 +1347,7 @@ delete_stale_distfiles () { continue fi - echo -n "===>>> Delete $file? y/[n] " + echo -n "===>>> Delete $file? y/n [n] " read answer case "$answer" in [yY]) pm_unlink $file ;; @@ -1383,7 +1383,7 @@ delete_all_distfiles () { echo '' if [ -n "$dist_list_files" ]; then echo "===>>> However, the list of files in $dist_list" - echo -n " should be current. Delete the files on this list? y/[n] " + echo -n " should be current. Delete the files on this list? y/n [n] " local answer f ; read answer case "$answer" in [yY]) for f in $dist_list_files; do @@ -1404,11 +1404,11 @@ delete_all_distfiles () { delete_all=delete_all else echo "===>>> Delete old and new distfiles for $origin" - echo -n " without prompting? y/[n] " + echo -n " without prompting? y/n [n] " local answer ; read answer case "$answer" in [yY]) delete_all=delete_all2 ;; - *) echo -n "===>>> Delete the current distfiles? y/[n] " + *) echo -n "===>>> Delete the current distfiles? y/n [n] " read answer case "$answer" in [yY]) delete_current=delete_current ;; @@ -1489,7 +1489,7 @@ if [ -n "$EXPUNGE" ]; then dep=${dep%/+CON*} ; echo " ${dep##*/}" done echo '' - echo -n "===>>> Delete this dependency data? y/[n] " + echo -n "===>>> Delete this dependency data? y/n [n] " read answer case "$answer" in [yY]) for f in $deplist; do @@ -1535,7 +1535,7 @@ if [ -n "$CLEAN_STALE" ]; then pkg_info $iport - echo -n "===>>> ${iport} is no longer depended on, delete? y/[n] " + echo -n "===>>> ${iport} is no longer depended on, delete? y/n [n] " read answer case "$answer" in [yY]) if [ -n "$BACKUP" ]; then @@ -1552,7 +1552,7 @@ if [ -n "$CLEAN_STALE" ]; then exec $0 -s $ARGS ;; - *) echo -n " ===>>> Keep listing $iport as a dependency? y/[n] " + *) echo -n " ===>>> Keep listing $iport as a dependency? y/n [n] " read answer case "$answer" in [yY]) no_del_list="${no_del_list}${iport}:" ;; @@ -1600,7 +1600,7 @@ check_interactive () { echo "===>>> +IGNOREME file is present for $1" fi - echo '' ; echo -n "===>>> Update ${1}${update_to}? n/[y] " + echo '' ; echo -n "===>>> Update ${1}${update_to}? y/n [y] " local answer ; read answer case "$answer" in [nN]*) INTERACTIVE_NO="${INTERACTIVE_NO}${1}:" ; return 1 ;; @@ -1950,7 +1950,7 @@ post_config () { echo '' echo "===>>> If you choose to proceed, the following will be done:" echo -e "$build_l" - echo -n "===>>> Proceed? n/[y] " + echo -n "===>>> Proceed? y/n [y] " read answer case "$answer" in [nN]*) safe_exit ;; @@ -2141,13 +2141,13 @@ if [ "$$" -eq "$PM_PARENT_PID" -a -z "$S files=`find $pdb -type f -name PM_UPGRADE_DONE_FLAG` if [ -n "$files" ]; then echo "===>>> There are 'install complete' flags from a previous" - echo -n " -[rf] run of ${0##*/}, delete them? y/[n] " + echo -n " -[rf] run of ${0##*/}, delete them? y/n [n] " read answer case "$answer" in [yY]) [ -n "$PM_SU_VERBOSE" ] && echo "===>>> Deleting 'install complete' flags" pm_find_s $pdb -type f -name PM_UPGRADE_DONE_FLAG -delete ;; - *) echo -n "===>>> Enable the -R option? y/[n] " + *) echo -n "===>>> Enable the -R option? y/n [n] " read answer case "$answer" in [yY]) RESTART=Ropt ; ARGS="-R $ARGS" ;; @@ -2388,7 +2388,7 @@ if [ -e "$pdb/$upg_port/+IGNOREME" ]; th echo '' echo "===>>> $upg_port has an +IGNOREME file" echo '' - echo -n "===>>> Update anyway? y/[n] " + echo -n "===>>> Update anyway? y/n [n] " read answer case "$answer" in [yY]) ;; # Let it build