From cbbe65c4460403aa98265db3b4a99e5c75883466 Mon Sep 17 00:00:00 2001
From: Daniel Joseph Barnhart Clark <dclark@pobox.com>
Date: Tue, 5 Sep 2006 00:14:16 +0000
Subject: EncapPackages: Solaris sh(1) sucks and apperantly hasn't been updated
 since the 1970s. Use ksh instead.

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2197 ce84e21b-d406-0410-9b95-82705330c041
---
 encap/src/makeself-dist/makedist.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'encap')

diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh
index 2294b03eb..2a6445d9e 100755
--- a/encap/src/makeself-dist/makedist.sh
+++ b/encap/src/makeself-dist/makedist.sh
@@ -80,9 +80,13 @@ BCFG2_SITE="$BSEP"
 cp $BSDIR/$BCFG2_SITE $DISTDIR
 
 # Create setup.sh in $DISTDIR
+if [ "`uname`x" = "SunOSx" ]; then
+    printf "#!/bin/ksh\n\n" > $DISTDIR/setup.sh
+else
+    printf "#!/bin/sh\n\n" > $DISTDIR/setup.sh
+fi
 ######################################################################
-cat > $DISTDIR/setup.sh << EOF
-#!/bin/sh
+cat >> $DISTDIR/setup.sh << EOF
 
 # \$Id$
 
@@ -154,10 +158,10 @@ getpasswd() {
     stty -echo
     trap "stty echo ; echo 'Interrupted' ; exit 1" 1 2 3 15
     printf "Enter \$1 password: "
-    read password1
+    read -r password1
     printf "\n"
     printf "Enter \$1 password again: "
-    read password2
+    read -r password2
     printf "\n"
     stty echo
     if [ "\${password1}x" != "\${password2}x" ]; then
-- 
cgit v1.2.3-1-g7c22