[Swift-commit] r7608 - SwiftApps/swift-galaxy/swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-02-17 23:37:04 -0600 (Mon, 17 Feb 2014)
New Revision: 7608

Modified:
   SwiftApps/swift-galaxy/swift/swiftforeach.xml
   SwiftApps/swift-galaxy/swift/swiftforeachtest.sh
Log:
param format

Modified: SwiftApps/swift-galaxy/swift/swiftforeach.xml
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-18 00:57:08 UTC (rev 7607)
+++ SwiftApps/swift-galaxy/swift/swiftforeach.xml	2014-02-18 05:37:04 UTC (rev 7608)
@@ -14,15 +14,15 @@
         
     #if $rangeorlist.rl == "rng" 
         swiftforeachrange.sh
-        $site 
-        $interpret
-        $exec
-        $rangeorlist.rngstart
-        $rangeorlist.rend
-        $rangeorlist.stepsize
-        $outloc
-        $logfile
-        $outlist
+        "${site}" 
+        "${interpret}"
+        "${exec}"
+        "${rangeorlist.rngstart}"
+        "${rangeorlist.rend}"
+        "${rangeorlist.stepsize}"
+        "${outloc}"
+        "${logfile}"
+        "${outlist}"
         #for $a in $stringarg
             ${a.stringargname}
         #end for
@@ -31,13 +31,13 @@
         #end for
     #elif $rangeorlist.rl == "lst"
         swiftforeachlist.sh
-        $site 
-        $interpret
-        $exec
-        $rangeorlist.listfile
-        $outloc
-        $logfile
-        $outlist
+        "${site}"
+        "${interpret}"
+        "${exec}"
+        "${rangeorlist.listfile}"
+        "${outloc}"
+        "${logfile}"
+        "${outlist}"
         #for $a in $stringarg
             ${a.stringargname}
         #end for
@@ -46,16 +46,16 @@
         #end for
     #else
         swiftforeachtest.sh
-        $site 
-        $interpret
-        $exec
-        $rangeorlist.rngstart
-        $rangeorlist.rend
-        $rangeorlist.stepsize
-        $rangeorlist.listfile
-        $outloc
-        $logfile
-        $outlist
+        "${site}"
+        "${interpret}"
+        "${exec}"
+        "${rangeorlist.rngstart}"
+        "${rangeorlist.rend}"
+        "${rangeorlist.stepsize}"
+        "${rangeorlist.listfile}"
+        "${outloc}"
+        "${logfile}"
+        "${outlist}"
         #for $a in $stringarg
             ${a.stringargname}
         #end for
@@ -128,20 +128,6 @@
         <param name="outloc" size="50" type="text" value="$HOME/swift-sandbox" label="location for output files" help="Swift will write output files here on disc">
             <sanitizer sanitize="False" />
         </param>
-
-        <conditional name="swiftargs">
-            <param name="mode" type="select" label="Swift commandline arguments">
-                <option value="default">no additional arguments (default)</option>
-                <option value="advanced">add commandline arguments</option>
-            </param>
-            <when value="default">
-            </when>
-            <when value="advanced">
-            <repeat name="swiftarg" title="swiftarg">
-            <param name="swiftargname" type="text" label="swiftarg" />
-            </repeat>
-            </when>
-        </conditional>
     </inputs>
     <outputs>
         <data format="txt" name="logfile" type="data" label="Swift output" />

Modified: SwiftApps/swift-galaxy/swift/swiftforeachtest.sh
===================================================================
--- SwiftApps/swift-galaxy/swift/swiftforeachtest.sh	2014-02-18 00:57:08 UTC (rev 7607)
+++ SwiftApps/swift-galaxy/swift/swiftforeachtest.sh	2014-02-18 05:37:04 UTC (rev 7608)
@@ -1,3 +1,8 @@
 #!/bin/bash
 
-echo $@ > /tmp/args.txt
+>/tmp/args.txt
+numargs=$#
+for i in $(seq 0 $numargs) ; do
+    echo $1 >> /tmp/args.txt
+    shift
+done