From 1aecb8d2ffc715db0f22b2bb9e7ccb765d3e47cb Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sat, 25 Mar 2000 14:44:42 +0000
Subject: [PATCH] More >&1 cleanups
---
src/bin/ipcclean/ipcclean.sh | 6 +++---
src/test/suite/runall | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/ipcclean/ipcclean.sh b/src/bin/ipcclean/ipcclean.sh
index 87acbecc8ab..699c90e9519 100644
--- a/src/bin/ipcclean/ipcclean.sh
+++ b/src/bin/ipcclean/ipcclean.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.4 2000/01/19 20:08:27 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.5 2000/03/25 14:44:41 momjian Exp $
#
CMDNAME=`basename $0`
@@ -41,7 +41,7 @@ if [ `uname` = 'Linux' ]; then
ipcs_lpid=
did_anything=
- if ps x | grep -s 'postmaster' >& /dev/null ; then
+ if ps x | grep -s 'postmaster' >/dev/null 2>&1 ; then
echo "$CMDNAME: You still have a postmaster running."
exit 1
fi
@@ -60,7 +60,7 @@ if [ `uname` = 'Linux' ]; then
# Don't do anything if process still running.
# (This check is conceptually phony, but it's
# useful anyway in practice.)
- ps hj$ipcs_pid >& /dev/null
+ ps hj$ipcs_pid >/dev/null 2>&1
if [ $? -eq 0 ]; then
echo "skipped. Process still exists (pid $ipcs_pid)."
else
diff --git a/src/test/suite/runall b/src/test/suite/runall
index d657e89497f..5fcce2dc1b8 100755
--- a/src/test/suite/runall
+++ b/src/test/suite/runall
@@ -2,7 +2,7 @@
foreach s (*.sql)
echo "===> $s";
- psql -q -e -n $USER < $s >& $s.out;
+ psql -q -e -n $USER < $s > $s.out 2>&1;
diff $s.out results/$s.out;
end
--
GitLab