Make shflags completely optional

Fixes #16.
pallet · Jul 9, 2011 · 3710a9a · 3710a9a
1 parent 13554de
commit 3710a9a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/pallet/stevedore/bash.clj b/src/pallet/stevedore/bash.clj
@@ -76,8 +76,9 @@
     (str (when (string? doc?)
            (str (shflags-doc-string doc?)))
          (when (seq flags)
-           (str (apply str (map (partial apply shflags-declare) flags))))
-         (shflags-setup)
+           (str
+            (apply str (map (partial apply shflags-declare) flags))
+            (shflags-setup)))
          (when (seq args)
            (str
              (string/join

diff --git a/test/pallet/script/lib_test.clj b/test/pallet/script/lib_test.clj
@@ -38,7 +38,7 @@
                                   (~declare-arguments
                                      [[:string asdf a "asdf" "e"]]))))
         "Only flags")
-    (is (=  "FLAGS \"$@\" || exit 1\neval set -- \"${FLAGS_ARGV}\"\na=$1\nb=$2\nc=$3\n"
+    (is (=  "a=$1\nb=$2\nc=$3\n"
            (with-script-context [:default]
                                 (stevedore/script
                                   (~declare-arguments
@@ -51,7 +51,7 @@
                                      [a b c
                                       [:string asdf a "asdf" "e"]]))))
         "Without docstring")
-    (is (= "FLAGS \"$@\" || exit 1\neval set -- \"${FLAGS_ARGV}\"\n"
+    (is (= ""
            (with-script-context [:default]
                                 (stevedore/script
                                   (~declare-arguments

diff --git a/test/pallet/stevedore/bash_test.clj b/test/pallet/stevedore/bash_test.clj
@@ -101,7 +101,7 @@
                                      (foo a) (bar b)))))
         "anonymous")
 
-    (is (= "foo() {\nFLAGS \"$@\" || exit 1\neval set -- \"${FLAGS_ARGV}\"\nx=$1\ny=$2\nfoo a\nbar b\n}"
+    (is (= "foo() {\nx=$1\ny=$2\nfoo a\nbar b\n}"
            (strip-ws (script (defn foo [x y]
                                (foo a) (bar b)))))
         "without flags")
@@ -280,7 +280,7 @@
     (let [stuff (quote (do
                          (local x 3)
                          (local y 4)))]
-      (is (= "foo() {\nFLAGS \"$@\" || exit 1\neval set -- \"${FLAGS_ARGV}\"\nx=$1\nlocal x=3\nlocal y=4\n}"
+      (is (= "foo() {\nx=$1\nlocal x=3\nlocal y=4\n}"
              (strip-ws (script (defn foo [x] ~stuff))))))))
 
 (deftest defvar-test