Skip to content

Commit

Permalink
Use dummy ssh keyfile for test purposes. [#35 state:resolved]
Browse files Browse the repository at this point in the history
  • Loading branch information
gschueler committed Oct 18, 2010
1 parent e178332 commit 6bbbb56
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 0 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ if [ ! -f $JAVA_HOME/bin/java ] ; then
exit 1
fi

if [ ! -f $HOME/.ssh/id_dsa.pub ] ; then
echo "ERROR: $HOME/.ssh/id_dsa file must exist. Please run: ssh-keygen -t dsa"
exit 1
fi
BASEDIR=`pwd`

# VERS will be determined from "version.properties" file in root
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.tools.ant.BuildException;

import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -165,6 +166,12 @@ protected void configureFramework()
typedefProperties = TYPEDEF_PROPERTIES;
new File(modulesBase).mkdirs();
ctlDavBase.mkdirs();
File dummykey = new File(baseDir, "etc/dummy_ssh_key.pub");
try {
dummykey.createNewFile();
} catch (IOException e) {
throw new BuildException("failed to create dummy keyfile: " + e.getMessage(), e);
}

// check to see if Setup was run, if so, just return.
if (new File(baseDir, "etc" + "/" + "framework.properties").exists()) {
Expand All @@ -181,6 +188,7 @@ protected void configureFramework()

final ArrayList argsList = new ArrayList(Arrays.asList(SETUP_ARGS));
argsList.add("--framework.webdav.uri=" + davUrl);
argsList.add("--framework.ssh.keypath=" + dummykey.getAbsolutePath());

try {
System.out.println("Running Setup");
Expand Down

0 comments on commit 6bbbb56

Please sign in to comment.