[Cogkit-svn] SF.net SVN: cogkit: [2030] trunk/current/src/cog/modules/provider-coaster

[<ha...@us...>]

Revision: 2030
          http://cogkit.svn.sourceforge.net/cogkit/?rev=2030&view=rev
Author:   hategan
Date:     2008-05-27 12:09:34 -0700 (Tue, 27 May 2008)

Log Message:
-----------
pass CA dir from local environment

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh
    trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java

Modified: trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh	2008-05-27 19:08:36 UTC (rev 2029)
+++ trunk/current/src/cog/modules/provider-coaster/resources/bootstrap.sh	2008-05-27 19:09:34 UTC (rev 2030)
@@ -11,18 +11,31 @@
 	rm -f $DJ
 	exit 1
 }
-if [ "$L" == "" ]; then 
+if [ "$L" == "" ]; then
 	L=~/coaster-boot-$ID.log 
 fi
 DJ=`mktemp /tmp/bootstrap.XXXXXX`
 echo "BS: $BS" >>$L
-wget -c -q $BS/coaster-bootstrap.jar -O $DJ >>$L 2>&1
+WGET=`which wget 2>/dev/null`
+if [ "X$WGET" == "X" ]; then
+	WGET=`which curl 2>/dev/null`
+	if [ "X$WGET" == "X" ]; then
+		error "No wget or curl available"
+	fi
+	WGET="curl -O $DJ $BS/coaster-bootstrap.jar >>$L 2>&1"
+else
+	WGET="wget -c -q $BS/coaster-bootstrap.jar -O $DJ >>$L 2>&1"
+fi
+eval $WGET
 if [ "$?" != "0" ]; then
 	error "Failed to download bootstrap jar from $BS"
 fi
-MD5SUM=`which gmd5sum`
+MD5SUM=`which gmd5sum 2>/dev/null`
 if [ "X$MD5SUM" == "X" ]; then
-	MD5SUM=`which md5sum`
+	MD5SUM=`which md5sum 2>/dev/null`
+	if [ "X$MD5SUM" == "X" ]; then
+		error "No md5sum or gmd5sum found"
+	fi
 fi
 AMD5=`$MD5SUM $DJ`
 echo "Expected checksum: $EMD5" >>$L
@@ -30,7 +43,6 @@
 if [ "${AMD5:0:32}" != "$EMD5" ]; then
 	error "Bootstrap jar checksum failed: $EMD5 != ${AMD5:0:32}"
 fi
-
 if [ "X$JAVA_HOME" != "X" ]; then
 	JAVA=$JAVA_HOME/bin/java
 else
@@ -40,9 +52,9 @@
 echo "JAVA=$JAVA" >>$L
 if [ -x $JAVA ]; then 
 	echo "$JAVA -Djava.home="$JAVA_HOME" -DX509_USER_PROXY="$X509_USER_PROXY" -DGLOBUS_HOSTNAME="$H" -jar $DJ $BS $LMD5 $LS $ID" >>$L
-	$JAVA -Djava.home="$JAVA_HOME" -DGLOBUS_TCP_PORT_RANGE="$GLOBUS_TCP_PORT_RANGE" -DX509_USER_PROXY="$X509_USER_PROXY" -DGLOBUS_HOSTNAME="$H" -jar $DJ $BS $LMD5 $LS $ID >>$L 2>&1
+	$JAVA -Djava.home="$JAVA_HOME" -DGLOBUS_TCP_PORT_RANGE="$GLOBUS_TCP_PORT_RANGE" -DX509_USER_PROXY="$X509_USER_PROXY" -DX509_CERT_DIR="$X509_CERT_DIR" -DGLOBUS_HOSTNAME="$H" -jar $DJ $BS $LMD5 $LS $ID >>$L 2>&1
 	EC=$?
-	echo "Exit code: $EC" >>$L
+	echo "EC: $EC" >>$L
 	rm -f $DJ
 	exit $EC
 else

Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java	2008-05-27 19:08:36 UTC (rev 2029)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java	2008-05-27 19:09:34 UTC (rev 2030)
@@ -213,6 +213,7 @@
         addProperty(args, "X509_USER_PROXY");
         addProperty(args, "GLOBUS_HOSTNAME");
         addProperty(args, "GLOBUS_TCP_PORT_RANGE");
+        addProperty(args, "X509_CERT_DIR");
     }
     
     private void addProperty(List args, String name) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.