Author: mladen.turk(a)jboss.com Date: 2008-02-06 04:20:55 -0500 (Wed, 06 Feb 2008) New Revision: 1374 Modified: trunk/build/install/makeself-header.sh Log: Fix agree message Modified: trunk/build/install/makeself-header.sh =================================================================== --- trunk/build/install/makeself-header.sh 2008-02-06 09:01:59 UTC (rev 1373) +++ trunk/build/install/makeself-header.sh 2008-02-06 09:20:55 UTC (rev 1374) @@ -1,6 +1,7 @@ cat << EOF > "$archname" #!/bin/sh # This script was generated using Makeself $MS_VERSION +# JBoss Httpd server CRCsum="$CRCsum" MD5="$MD5sum" @@ -55,6 +56,24 @@ test \$bytes -gt 0 && dd ibs=1 obs=1024 count=\$bytes ; } 2> /dev/null } +MS_Agree() +{ + while true + do + read reply leftover + case \$reply in + [yY] | [yY][eE][sS]) + echo "yes" + return 0 + ;; + [nN] | [nN][oO]) + echo "no" + return 0 + ;; + esac + done +} + MS_Help() { cat << EOH >&2 @@ -81,22 +100,6 @@ EOH } -MS_Agree() -{ - while [ "true" ]; do - read reply leftover - case $reply in - [yY] | [yY][eE][sS]) - echo "yes" - return 0 - ;; - [nN] | [nN][oO]) - echo "no" - return 0 - ;; - esac - done -} MS_Eula() { @@ -249,8 +252,8 @@ 18 October 2006 EOEULA MS_Printf "\nDo you agree to the above license terms? [yes or no]\n" - if test "`MS_Agree`" = "no"; then - MS_Printf"If you don't agree to the license you can't install this software\n" + if test "\`MS_Agree\`" = "no"; then + MS_Printf "If you don't agree to the license you can't install this software\n" exit 1 fi } @@ -444,6 +447,8 @@ esac done +MS_Eula + case "\$copy" in copy) tmpdir=\$TMPROOT/makeself.\$RANDOM.\`date +"%y%m%d%H%M%S"\`.\$\$