From e1f3dd033ea86163eb97f8779d978d4ba80de93b Mon Sep 17 00:00:00 2001 From: Daniel Joseph Barnhart Clark Date: Tue, 5 Sep 2006 01:04:08 +0000 Subject: EncapPackages: Solaris does have a working expr, in /usr/ucb. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2199 ce84e21b-d406-0410-9b95-82705330c041 --- encap/src/makeself-dist/makedist.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'encap') diff --git a/encap/src/makeself-dist/makedist.sh b/encap/src/makeself-dist/makedist.sh index 2a6445d9e..385bd5b18 100755 --- a/encap/src/makeself-dist/makedist.sh +++ b/encap/src/makeself-dist/makedist.sh @@ -82,8 +82,10 @@ cp $BSDIR/$BCFG2_SITE $DISTDIR # Create setup.sh in $DISTDIR if [ "`uname`x" = "SunOSx" ]; then printf "#!/bin/ksh\n\n" > $DISTDIR/setup.sh + EXPR="/usr/ucb/expr" else printf "#!/bin/sh\n\n" > $DISTDIR/setup.sh + EXPR="expr" fi ###################################################################### cat >> $DISTDIR/setup.sh << EOF @@ -197,13 +199,13 @@ fi # Sed quoting function - quote the &, :, ' and \ characters sedquote() { i=1 - while [ \$i -le \`expr length \$1\` ]; do - c=\`expr substr \$1 \$i 1\` + while [ \$i -le \`${EXPR} length \$1\` ]; do + c=\`${EXPR} substr \$1 \$i 1\` if [ "\${c}x" = "&x" -o "\${c}x" = ":x" -o "\${c}x" = "'x" -o "\${c}x" = "\\\\x" ]; then c=\\\\\${c} fi printf "%s" "\$c" - i=\`expr \$i + 1\` + i=\`${EXPR} \$i + 1\` done } -- cgit v1.2.3-1-g7c22