introduced set -v

mfiers · Nov 14, 2012 · d99d938 · d99d938
1 parent dc6f395
commit d99d938
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 17 deletions.
diff --git a/moa/data/templates/map.jinja2 b/moa/data/templates/map.jinja2
@@ -1,16 +1,13 @@
 ### run
 
-cat <<EndOfScriptEndOfScriptEndOfScriptEndOfScript
-{{ process }}
-EndOfScriptEndOfScriptEndOfScriptEndOfScript
-{% if not dummy %}
+set -v
+
 {{ process }}
-{% endif %}
 
 ### unittest noexpand
 
 moa map -t test -f --np
-for x in `seq -w 1 20`; do 
+for x in `seq -w 1 20`; do
    touch test.${x}.in
 done
 moa set process='cp {{input}} {{output}}'

diff --git a/moa/data/templates/map.moa b/moa/data/templates/map.moa
@@ -26,14 +26,8 @@ name: map
 parameters:
   process:
     category: ''
-    default: true
     help: The command to execute
     optional: false
     type: string
     prevent_expansion: true
-  dummy:
-    default: false
-    help: do a dummy run
-    type: boolean
-    optional: true
 title: Execute a "map" ad-hoc analysis
diff --git a/moa/data/templates/reduce.jinja2 b/moa/data/templates/reduce.jinja2
@@ -1,12 +1,12 @@
 ### run
 
-echo '{{ process }}'
+set -v
 {{ process }}
 
 ### unittest noexpand
 
 moa map -t test -f --np
-for x in `seq -w 1 20`; do 
+for x in `seq -w 1 20`; do
    touch test.${x}.in
 done
 moa set process='cp {{input}} {{output}}'

diff --git a/moa/data/templates/reduce.moa b/moa/data/templates/reduce.moa
@@ -26,7 +26,7 @@ name: reduce
 parameters:
   process:
     category: ''
-    default: true
+    default: 'echo "input: {{ input|join(" ")}}"; echo "output: {{ output }}"'
     help: The command to execute
     optional: false
     type: string

diff --git a/moa/data/templates/simple.jinja2 b/moa/data/templates/simple.jinja2
@@ -1,6 +1,6 @@
 ### run
 
-echo '{{ process }}'
+set -v
 {{ process }}
 
 

diff --git a/moa/data/templates/simple.moa b/moa/data/templates/simple.moa
@@ -17,7 +17,6 @@ parameter_category_order:
 parameters:
   process:
     category: ''
-    default: 'echo "Need to specify a process"'
     help: The command to execute
     optional: false
     type: string