diff options
| -rw-r--r-- | src/edu/stsci/CondaInstaller.groovy | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/edu/stsci/CondaInstaller.groovy b/src/edu/stsci/CondaInstaller.groovy index ed5abfa..361a7c9 100644 --- a/src/edu/stsci/CondaInstaller.groovy +++ b/src/edu/stsci/CondaInstaller.groovy @@ -60,10 +60,9 @@ class CondaInstaller implements Serializable { return p } - int download() { + void download() { println("${this.ident} Downloading $url") def proc = this.runshell("curl -sLO ${this.url}") - return proc.exitValue() // Whatever Jenkins... Why is this so hard? /* @@ -75,7 +74,7 @@ class CondaInstaller implements Serializable { */ } - int install() { + void install() { if (new File(this.prefix).exists()) { println("${this.ident} ${this.prefix} exists.") return 0xFF @@ -85,16 +84,7 @@ class CondaInstaller implements Serializable { this.download() //} - def cmd = "bash ${this.installer} -b -p ${this.prefix}" - def proc = cmd.execute() - def stdout = new StringBuffer() - - proc.inputStream.eachLine { println(it) } - - //proc.waitForProcessOutput(stdout, System.err) - //print(stdout.toString()) - - return proc.exitValue() + this.runshell("bash ${this.installer} -b -p ${this.prefix}") } private void detect() { |