Merge pull request #1000 from phillipkroll/patch-1

Update scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/Unzi...
This commit is contained in:
Adrian Cole 2012-11-24 10:13:22 -08:00
commit 2a20ac4b31
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@ public class UnzipHttpResponseIntoDirectory extends InterpretableStatement {
public UnzipHttpResponseIntoDirectory(String method, URI endpoint, Multimap<String, String> headers, String dir) { public UnzipHttpResponseIntoDirectory(String method, URI endpoint, Multimap<String, String> headers, String dir) {
super( super(
format( format(
"({md} %s &&{cd} %s &&curl -X %s -s --retry 20 %s %s >extract.zip && unzip -o -qq extract.zip&& rm extract.zip)\n", "({md} %s &&{cd} %s &&curl -X -L %s -s --retry 20 %s %s >extract.zip && unzip -o -qq extract.zip&& rm extract.zip)\n",
dir, dir, method, Joiner.on(' ').join( dir, dir, method, Joiner.on(' ').join(
transform(headers.entries(), new Function<Entry<String, String>, String>() { transform(headers.entries(), new Function<Entry<String, String>, String>() {

View File

@ -41,7 +41,7 @@ public class UnzipHttpResponseIntoDirectoryToTest {
public void testUnzipHttpResponseIntoDirectoryUNIX() { public void testUnzipHttpResponseIntoDirectoryUNIX() {
assertEquals( assertEquals(
jboss.render(OsFamily.UNIX), jboss.render(OsFamily.UNIX),
"(mkdir -p /tmp &&cd /tmp &&curl -X GET -s --retry 20 http://superb-sea2.dl.sourceforge.net/project/jboss/JBoss/JBoss-5.0.0.CR2/jboss-5.0.0.CR2-jdk6.zip >extract.zip && unzip -o -qq extract.zip&& rm extract.zip)\n"); "(mkdir -p /tmp &&cd /tmp &&curl -X -L GET -s --retry 20 http://superb-sea2.dl.sourceforge.net/project/jboss/JBoss/JBoss-5.0.0.CR2/jboss-5.0.0.CR2-jdk6.zip >extract.zip && unzip -o -qq extract.zip&& rm extract.zip)\n");
} }
public void testUnzipHttpResponseIntoDirectoryWINDOWS() { public void testUnzipHttpResponseIntoDirectoryWINDOWS() {