From e64a438754d0e658a071ce4e484b509ed7488127 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 14 Mar 2005 02:52:25 +0000 Subject: [PATCH] Don't declare a variable, and pipe that declaration to fmt. Bad things happen (i.e. the variable doesn't get set). Also, use the full path to ``ls''. --- en/gnome/gnome_upgrade.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/en/gnome/gnome_upgrade.sh b/en/gnome/gnome_upgrade.sh index 6efa595638..3d4ce7a100 100644 --- a/en/gnome/gnome_upgrade.sh +++ b/en/gnome/gnome_upgrade.sh @@ -34,8 +34,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $Id: gnome_upgrade.sh,v 1.18 2005-03-13 19:13:20 adamw Exp $ -# $FreeBSD$ +# $Id: gnome_upgrade.sh,v 1.19 2005-03-14 02:52:25 marcus Exp $ # # This script will aid in doing major upgrades to the GNOME Desktop (e.g. @@ -188,14 +187,14 @@ upgrade_list= if [ "$1" = "-restart" ]; then upgrade_list=$2 if [ -z "${upgrade_list}" ]; then - errormsg="ERROR: -restart requires a path to the list of GNOME ports to upgrade as its argument." | /usr/bin/fmt 75 79 + errormsg="ERROR: -restart requires a path to the list of GNOME ports to upgrade as its argument." fi if [ ! -f ${upgrade_list} ]; then - errormsg="ERROR: ${upgrade_list} does not exist or is not a file." | /usr/bin/fmt 75 79 + errormsg="ERROR: ${upgrade_list} does not exist or is not a file." fi if [ ! -z "${errormsg}" ]; then echo "${errormsg}" | /usr/bin/fmt 75 79 - possible_files=`ls ${TMPDIR}/gnome_upgrade_lst*` + possible_files=`/bin/ls ${TMPDIR}/gnome_upgrade_lst*` if [ $? = 0 ]; then echo "Possible upgrade lists from previous upgrade attempts: ${possible_files}" | /usr/bin/fmt 75 79 fi