aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBryan Henderson <bryanh@giraffe.netgate.net>1996-11-26 08:12:39 +0000
committerBryan Henderson <bryanh@giraffe.netgate.net>1996-11-26 08:12:39 +0000
commit8cfe27dff005bbc786905fc530e7dcb16dd1f18c (patch)
tree245cd619d3d9f2a487815e020246883f0240c323 /src
parent93f722536f1269fc327968f28329e3f64e172ed0 (diff)
downloadpostgresql-8cfe27dff005bbc786905fc530e7dcb16dd1f18c.tar.gz
postgresql-8cfe27dff005bbc786905fc530e7dcb16dd1f18c.zip
OK, I think I've got the postconfig thing right now.
Diffstat (limited to 'src')
-rw-r--r--src/bin/initdb/initdb.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 2cd8bdcac4e..80d80ec47d9 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -26,7 +26,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.16 1996/11/25 05:51:50 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.17 1996/11/26 08:12:39 bryanh Exp $
#
#-------------------------------------------------------------------------
@@ -48,11 +48,13 @@ CMDNAME=`basename $0`
# specify the pglib option. Postconfig may validly not exist, in which case
# our invocation of it silently fails.
-# The x=x below is to satisfy export if postconfig returns nothing.
# The 2>/dev/null is to swallow the "postconfig: not found" message if there
-# is not postconfig, but it is ineffective in some shells. Better ideas?
+# is no postconfig.
-export x=x $(postconfig 2>/dev/null)
+postconfig_result="$(sh -c postconfig 2>/dev/null)"
+if [ ! -z $postconfig_result ]; then
+ export $postconfig_result
+fi
# Set defaults:
debug=0