Revision: 3475 Author: eliot Date: 2015-10-16 10:59:15 -0700 (Fri, 16 Oct 2015) Log Message: ----------- Fix syntax for shell funcitons in envvars.sh

Modified Paths: -------------- branches/Cog/image/envvars.sh

Modified: branches/Cog/image/envvars.sh =================================================================== --- branches/Cog/image/envvars.sh 2015-10-08 19:36:03 UTC (rev 3474) +++ branches/Cog/image/envvars.sh 2015-10-16 17:59:15 UTC (rev 3475) @@ -23,11 +23,11 @@ OSREL=`uname -r | sed 's/([0-9]*).([0-9]*).([0-9]*).*$/\1.\2.\3/'` fi

-test "$OS" = Darwin && function quietmd5 () { /sbin/md5 -q "$1" 2>/dev/null; } -test "$OS" = Darwin || function quietmd5 () { /usr/bin/md5sum "$1" | sed 's/ .*$//' 2>/dev/null; } +test "$OS" = Darwin && function quietmd5 { /sbin/md5 -q "$1" 2>/dev/null; } +test "$OS" = Darwin || function quietmd5 { /usr/bin/md5sum "$1" | sed 's/ .*$//' 2>/dev/null; }

-test "$OS" = Darwin && function geturl () { FILE=`basename "$1"`; curl -C - "`echo $1 | sed 's/ /%20/g'`" -o "$FILE"; } -test "$OS" = Darwin || function geturl () { wget -c "$1"; } +test "$OS" = Darwin && function geturl { FILE=`basename "$1"`; curl -C - "`echo $1 | sed 's/ /%20/g'`" -o "$FILE"; } +test "$OS" = Darwin || function geturl { wget -c "$1"; }

if [ "$OS" != Darwin -a ! -x "`which wget`" ]; then echo "cannot find wget. wget for Windows is available from http://gnuwin32.sourceforge.net/packages/wget.htm, probably as http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-setup.exe" 1>&2 @@ -41,7 +41,7 @@ exit 1 fi

-function get_vm_from_tar() # VM VMHASH VMARC VMARCHASH +function get_vm_from_tar # VM VMHASH VMARC VMARCHASH { VM="$1" VMDIR=`echo $VM | sed 's//.*//'` VMHASH="$2" @@ -64,7 +64,7 @@ fi }

-function get_vm_from_zip() # VM VMHASH VMARC VMARCHASH +function get_vm_from_zip # VM VMHASH VMARC VMARCHASH { VM="$1" VMDIR=`echo $VM | sed 's//.*//'` VMHASH="$2"