From ec793794b28b9621e5a40b12725ffec48a4bda6f Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 19 Jul 2002 15:31:43 +0000 Subject: [PATCH] Another "$@" cleanup with new syntax, ${1+"$@"}. --- src/bin/pg_ctl/pg_ctl.sh | 6 +++--- src/bin/pgaccess/main.tcl | 2 +- src/bin/pgaccess/pgaccess.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh index 0292d3ec32..6181533878 100755 --- a/src/bin/pg_ctl/pg_ctl.sh +++ b/src/bin/pg_ctl/pg_ctl.sh @@ -8,7 +8,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.26 2002/07/19 13:50:06 momjian Exp $ +# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Attic/pg_ctl.sh,v 1.27 2002/07/19 15:31:42 momjian Exp $ # #------------------------------------------------------------------------- @@ -332,12 +332,12 @@ if [ "$op" = "start" -o "$op" = "restart" ];then fi if [ -n "$logfile" ]; then - "$po_path" ${1:+"$@"} >$logfile 2>&1 & + "$po_path" ${1+"$@"} >$logfile 2>&1 & else # when starting without log file, redirect stderr to stdout, so # pg_ctl can be invoked with >$logfile and still have pg_ctl's # stderr on the terminal. - "$po_path" ${1:+"$@"} &1 & + "$po_path" ${1+"$@"} &1 & fi # if had an old lockfile, check to see if we were able to start diff --git a/src/bin/pgaccess/main.tcl b/src/bin/pgaccess/main.tcl index 37f30d96fa..3fac71d5b5 100644 --- a/src/bin/pgaccess/main.tcl +++ b/src/bin/pgaccess/main.tcl @@ -1,6 +1,6 @@ #!/bin/sh # the next line restarts using wish \ -exec wish "$0" ${1:+"$@"} +exec wish "$0" ${1+"$@"} image create bitmap dnarw -data { #define down_arrow_width 15 diff --git a/src/bin/pgaccess/pgaccess.sh b/src/bin/pgaccess/pgaccess.sh index aeaf4d097d..5c6cba3939 100755 --- a/src/bin/pgaccess/pgaccess.sh +++ b/src/bin/pgaccess/pgaccess.sh @@ -10,4 +10,4 @@ export PGACCESS_HOME export PGLIB export PGPORT -exec "${PATH_TO_WISH}" "${PGACCESS_HOME}/main.tcl" "$@" +exec "${PATH_TO_WISH}" "${PGACCESS_HOME}/main.tcl" ${1+"$@"} -- 2.40.0