Merge branch 'develop' into feature/dir-tracking-directive

Factual · Sep 21, 2015 · 13817e4 · 13817e4
2 parents 4fd7a28 + 17f1f1a
commit 13817e4
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/bin/drake b/bin/drake
@@ -60,7 +60,7 @@ fi
 
 function build_jar {
   echo "Using DRAKE_HOME: $DRAKE_HOME"
-  DRAKE_JAR=$DRAKE_HOME/target/drake.jar
+  DRAKE_JAR=${DRAKE_JAR:-$DRAKE_HOME/target/drake.jar}
   if [[ ! -f $DRAKE_JAR ]]; then
     echo ""
     echo "========= UBERJAR COMPILING ========="
@@ -84,8 +84,8 @@ if [ ! -z ${DRAKE_HOME:+x} ] && [ -d $DRAKE_HOME ] && [ -f "$DRAKE_HOME/project.
   build_jar
 else
   DRAKE_HOME=~/.drakerc
-  mkdir -p $DRAKE_HOME/jar
-  DRAKE_JAR=$DRAKE_HOME/jar/drake-$DRAKE_VERSION-standalone.jar
+  DRAKE_JAR=${DRAKE_JAR:-$DRAKE_HOME/jar/drake-$DRAKE_VERSION-standalone.jar}
+  mkdir -p $(dirname $DRAKE_JAR)
   if [ ! -f $DRAKE_JAR ]; then
     echo "Downloading drake jar for version $DRAKE_VERSION..."
     echo ""

diff --git a/src/drake/core.clj b/src/drake/core.clj
@@ -189,10 +189,10 @@
   [inputs]
   (let [inputs-info (map parser/make-file-stats inputs)]
     {:existing (->> (filter :exists inputs-info)
-                    (map :file))
+                    (map :path))
      ;; Non-existing, non-optional inputs
      :missing (->> (remove (some-fn :optional :exists) inputs-info)
-                   (map :file))}))
+                   (map :path))}))
 
 (defn- should-build?
   "Given the parse tree and a step index, determines whether it should

diff --git a/src/drake/parser.clj b/src/drake/parser.clj
@@ -320,7 +320,7 @@
     {:optional (optional-input? filename)
      :exists (dfs/fs di/data-in? filepath)
      :path filepath
-     :file filename}))
+     :raw-name filename}))
 
 (defn modify-filename
   [filename mod-fn]

diff --git a/src/drake/protocol_interpreters.clj b/src/drake/protocol_interpreters.clj
@@ -1,5 +1,6 @@
 (ns drake.protocol-interpreters
   (:require [drake-interface.core :refer [Protocol]]
+            [drake.shell :as shell]
             [drake.protocol :refer [register-protocols! run-interpreter]]))
 
 (def WINDOWS? (.startsWith (System/getProperty "os.name") "Win"))
@@ -12,9 +13,7 @@
                          (run [_ step]
                            (run-interpreter step interpreter args)))))
 
-(dorun (map register-interpreter! [(if WINDOWS?
-                                     ["shell" "cmd" ["/C"]]
-                                     ["shell" (get (System/getenv) "SHELL") nil])
+(dorun (map register-interpreter! [(into ["shell"] (shell/shell-cmd-prelude))
                                    ["ruby" "ruby" nil]
                                    ["python" "python" nil]
                                    ["node" "node" nil]

diff --git a/src/drake/shell.clj b/src/drake/shell.clj
@@ -1,6 +1,6 @@
 (ns drake.shell
   (:require [clojure.string :refer [join]]
-            [clojure.tools.logging :refer [debug]]
+            [clojure.tools.logging :as log :refer [debug]]
             [clojure.java.io :refer [as-file]]
             [slingshot.slingshot :refer [throw+]]
             [fs.core :as fs]
@@ -50,6 +50,14 @@
       (catch java.lang.InterruptedException _)    ;; if we interrupt
       (catch java.io.IOException _))))            ;; if the process dies
 
+(defn shell-cmd-prelude [& unix-suffix]
+  (if (.startsWith (System/getProperty "os.name") "Win")
+       ["cmd" "/C"]
+       (cons (or (get (System/getenv) "SHELL")
+                 (do (log/warnf "$SHELL not set; defaulting to /bin/sh")
+                     "/bin/sh"))
+             unix-suffix)))
+
 (defn shell
   "Runs the specified command and arguments using the system shell.
 
@@ -83,16 +91,15 @@
   [& args]
   (let [[cmd {:keys [out err die use-shell no-stdin env replace-env exec-dir] :as opts}]
         (split-with string? args)
-        windows? (.startsWith (System/getProperty "os.name") "Win")
         env (as-env-strings (if replace-env
                               env
                               (merge (into {} (System/getenv)) env)))
         ^"[Ljava.lang.String;" cmd-for-exec
-        (into-array (if-not use-shell
+        (into-array String
+                    (if-not use-shell
                       cmd
-                      [(if windows? "cmd" (get (System/getenv) "SHELL"))
-                       (if windows? "/C" "-c")
-                       (join " " cmd)]))
+                      `[~@(shell-cmd-prelude "-c")
+                        ~(join " "  cmd)]))
         proc (.exec (Runtime/getRuntime)
                     cmd-for-exec
                     ^"[Ljava.lang.String;" env