[Swift-commit] r6683 - in SwiftTutorials/UofC_2013-07-29-uc3: . part01 part02 part03 part04 part05 part06 part08

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Mon Jul 29 16:03:07 CDT 2013


Author: davidk
Date: 2013-07-29 16:03:07 -0500 (Mon, 29 Jul 2013)
New Revision: 6683

Added:
   SwiftTutorials/UofC_2013-07-29-uc3/part01/apps
   SwiftTutorials/UofC_2013-07-29-uc3/part01/clean.sh
   SwiftTutorials/UofC_2013-07-29-uc3/part01/sites.xml
   SwiftTutorials/UofC_2013-07-29-uc3/part02/apps
   SwiftTutorials/UofC_2013-07-29-uc3/part02/clean.sh
   SwiftTutorials/UofC_2013-07-29-uc3/part02/sites.xml
   SwiftTutorials/UofC_2013-07-29-uc3/part03/apps
   SwiftTutorials/UofC_2013-07-29-uc3/part03/clean.sh
   SwiftTutorials/UofC_2013-07-29-uc3/part03/sites.xml
   SwiftTutorials/UofC_2013-07-29-uc3/part04/apps
   SwiftTutorials/UofC_2013-07-29-uc3/part04/clean.sh
   SwiftTutorials/UofC_2013-07-29-uc3/part04/sites.xml
   SwiftTutorials/UofC_2013-07-29-uc3/part05/apps
   SwiftTutorials/UofC_2013-07-29-uc3/part05/clean.sh
   SwiftTutorials/UofC_2013-07-29-uc3/part05/sites.xml
   SwiftTutorials/UofC_2013-07-29-uc3/part06/apps
   SwiftTutorials/UofC_2013-07-29-uc3/part06/clean.sh
   SwiftTutorials/UofC_2013-07-29-uc3/part06/sites.xml
   SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift
Removed:
   SwiftTutorials/UofC_2013-07-29-uc3/part01/tc
   SwiftTutorials/UofC_2013-07-29-uc3/part02/p2b.swift
   SwiftTutorials/UofC_2013-07-29-uc3/part02/tc
   SwiftTutorials/UofC_2013-07-29-uc3/part03/tc
   SwiftTutorials/UofC_2013-07-29-uc3/part04/tc
   SwiftTutorials/UofC_2013-07-29-uc3/part05/tc
   SwiftTutorials/UofC_2013-07-29-uc3/part06/tc
   SwiftTutorials/UofC_2013-07-29-uc3/part07/
   SwiftTutorials/UofC_2013-07-29-uc3/part08/p00.swift
Modified:
   SwiftTutorials/UofC_2013-07-29-uc3/part01/p1.swift
   SwiftTutorials/UofC_2013-07-29-uc3/part02/p2.swift
   SwiftTutorials/UofC_2013-07-29-uc3/part03/p3.swift
   SwiftTutorials/UofC_2013-07-29-uc3/part04/p4.swift
   SwiftTutorials/UofC_2013-07-29-uc3/part05/p5.swift
   SwiftTutorials/UofC_2013-07-29-uc3/part06/p6.swift
   SwiftTutorials/UofC_2013-07-29-uc3/setup.sh
Log:
Fixes/modifications for parts 01-07


Copied: SwiftTutorials/UofC_2013-07-29-uc3/part01/apps (from rev 6681, SwiftTutorials/UofC_2013-07-29-uc3/part01/tc)
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part01/apps	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part01/apps	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+localhost simulate simulate.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part01/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part01/clean.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part01/clean.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx _concurrent


Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part01/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/UofC_2013-07-29-uc3/part01/p1.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part01/p1.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part01/p1.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -2,7 +2,7 @@
 
 app (file o) mysim ()
 {
-  random stdout=@filename(o);
+  simulate stdout=@filename(o);
 }
 
 file f = mysim();

Added: SwiftTutorials/UofC_2013-07-29-uc3/part01/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part01/sites.xml	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part01/sites.xml	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,9 @@
+<config>
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/work</workdirectory>
+   </pool>
+</config>

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part01/tc
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part01/tc	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part01/tc	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1 +0,0 @@
-localhost random random.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part02/apps
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part02/apps	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part02/apps	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+localhost simulate simulate.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part02/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part02/clean.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part02/clean.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx *.out _concurrent


Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part02/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/UofC_2013-07-29-uc3/part02/p2.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part02/p2.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part02/p2.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -2,8 +2,8 @@
 
 app (file o) mysim ()
 {
-  random stdout=@filename(o);
+  simulate stdout=@filename(o);
 }
 
-file f<"sim.out">;
+file f <"sim.out">;
 f = mysim();

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part02/p2b.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part02/p2b.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part02/p2b.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1,9 +0,0 @@
-type file;
-
-app (file o) mysim ()
-{
-  random stdout=@filename(o);
-}
-
-file f<"output/sim.out">;
-f = mysim();

Added: SwiftTutorials/UofC_2013-07-29-uc3/part02/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part02/sites.xml	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part02/sites.xml	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,9 @@
+<config>
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/work</workdirectory>
+   </pool>
+</config>

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part02/tc
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part02/tc	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part02/tc	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1 +0,0 @@
-localhost random random.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part03/apps
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part03/apps	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part03/apps	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+localhost simulate simulate.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part03/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part03/clean.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part03/clean.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx *.out _concurrent


Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part03/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/UofC_2013-07-29-uc3/part03/p3.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part03/p3.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part03/p3.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -2,7 +2,7 @@
 
 app (file o) mysim ()
 {
-  random stdout=@filename(o);
+  simulate stdout=@filename(o);
 }
 
 foreach i in [0:9] {

Added: SwiftTutorials/UofC_2013-07-29-uc3/part03/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part03/sites.xml	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part03/sites.xml	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,9 @@
+<config>
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/work</workdirectory>
+   </pool>
+</config>

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part03/tc
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part03/tc	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part03/tc	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1 +0,0 @@
-localhost random random.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part04/apps
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part04/apps	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part04/apps	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+localhost simulate simulate.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part04/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part04/clean.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part04/clean.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx output _concurrent


Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part04/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/UofC_2013-07-29-uc3/part04/p4.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part04/p4.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part04/p4.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -2,7 +2,7 @@
 
 app (file o) mysim ()
 {
-  random stdout=@filename(o);
+  simulate stdout=@filename(o);
 }
 
 foreach i in [0:9] {

Added: SwiftTutorials/UofC_2013-07-29-uc3/part04/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part04/sites.xml	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part04/sites.xml	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,9 @@
+<config>
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/work</workdirectory>
+   </pool>
+</config>

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part04/tc
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part04/tc	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part04/tc	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1 +0,0 @@
-localhost random random.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part05/apps
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part05/apps	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part05/apps	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,2 @@
+localhost simulate simulate.sh
+localhost stats stats.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part05/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part05/clean.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part05/clean.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx output _concurrent


Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part05/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/UofC_2013-07-29-uc3/part05/p5.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part05/p5.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part05/p5.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -2,12 +2,12 @@
 
 app (file o) mysim ()
 {
-  random stdout=@filename(o);
+  simulate stdout=@filename(o);
 }
 
 app (file o) analyze (file s[])
 {
-  average @filenames(s) stdout=@filename(o);
+  stats @filenames(s) stdout=@filename(o);
 }
 
 file sims[];

Added: SwiftTutorials/UofC_2013-07-29-uc3/part05/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part05/sites.xml	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part05/sites.xml	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,9 @@
+<config>
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/work</workdirectory>
+   </pool>
+</config>

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part05/tc
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part05/tc	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part05/tc	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1,2 +0,0 @@
-localhost random  random.sh
-localhost average avg.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part06/apps
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part06/apps	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part06/apps	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,2 @@
+localhost simulate simulate.sh
+localhost stats stats.sh

Added: SwiftTutorials/UofC_2013-07-29-uc3/part06/clean.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part06/clean.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part06/clean.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1 @@
+rm -rf *.log *.rlog *.d *.kml *.swiftx output _concurrent


Property changes on: SwiftTutorials/UofC_2013-07-29-uc3/part06/clean.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: SwiftTutorials/UofC_2013-07-29-uc3/part06/p6.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part06/p6.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part06/p6.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1,23 +1,22 @@
 type file;
 
-app (file o) mysim2 (int timesteps)
+app (file o) mysim (int timesteps)
 {
-  random2 timesteps stdout=@filename(o);
+  simulate timesteps stdout=@filename(o);
 }
 
 app (file o) analyze (file s[])
 {
-  average @filenames(s) stdout=@filename(o);
+  stats @filenames(s) stdout=@filename(o);
 }
 
 file sims[];
 int  nsim = @toInt(@arg("nsim","10"));
-
 int steps = @toInt(@arg("steps","1"));
 
 foreach i in [0:nsim-1] {
   file simout <single_file_mapper; file=@strcat("output/sim_",i,".out")>;
-  simout = mysim2(steps);
+  simout = mysim(steps);
   sims[i] = simout;
 }
 

Added: SwiftTutorials/UofC_2013-07-29-uc3/part06/sites.xml
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part06/sites.xml	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part06/sites.xml	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,9 @@
+<config>
+   <pool handle="localhost">
+      <execution provider="coaster" jobmanager="local:local"/>
+      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="initialScore">10000</profile>
+      <filesystem provider="local"/>
+      <workdirectory>{env.HOME}/work</workdirectory>
+   </pool>
+</config>

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part06/tc
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part06/tc	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part06/tc	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1,2 +0,0 @@
-localhost random2  random2.sh
-localhost average avg.sh

Deleted: SwiftTutorials/UofC_2013-07-29-uc3/part08/p00.swift
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part08/p00.swift	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part08/p00.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1,28 +0,0 @@
-type file;
-
-# Application to be called by this script
-
-file simulation_script <"simulate.sh">;
-
-# app() functions for application programs to be called:
-
-app (file out) simulation (file script, int timesteps, int sim_range)
-{
-  sh @filename(script) timesteps sim_range stdout=@filename(out);
-}
-
-# Command line params to this script:
-
-int  nsim  = @toInt(@arg("nsim",  "10"));  # number of simulation programs to run
-int  range = @toInt(@arg("range", "100")); # range of the generated random numbers
-
-# Main script and data
-
-int steps=3;
-
-tracef("\n*** Script parameters: nsim=%i steps=%i range=%i \n\n", nsim, steps, range);
-
-foreach i in [0:nsim-1] {
-  file simout <single_file_mapper; file=@strcat("data/out_p00/sim_",i,".out")>;
-  simout = simulation(simulation_script, steps, range);
-}

Copied: SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift (from rev 6681, SwiftTutorials/UofC_2013-07-29-uc3/part08/p00.swift)
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift	                        (rev 0)
+++ SwiftTutorials/UofC_2013-07-29-uc3/part08/p8.swift	2013-07-29 21:03:07 UTC (rev 6683)
@@ -0,0 +1,28 @@
+type file;
+
+# Application to be called by this script
+
+file simulation_script <"simulate.sh">;
+
+# app() functions for application programs to be called:
+
+app (file out) simulation (file script, int timesteps, int sim_range)
+{
+  sh @filename(script) timesteps sim_range stdout=@filename(out);
+}
+
+# Command line params to this script:
+
+int  nsim  = @toInt(@arg("nsim",  "10"));  # number of simulation programs to run
+int  range = @toInt(@arg("range", "100")); # range of the generated random numbers
+
+# Main script and data
+
+int steps=3;
+
+tracef("\n*** Script parameters: nsim=%i steps=%i range=%i \n\n", nsim, steps, range);
+
+foreach i in [0:nsim-1] {
+  file simout <single_file_mapper; file=@strcat("data/out_p00/sim_",i,".out")>;
+  simout = simulation(simulation_script, steps, range);
+}

Modified: SwiftTutorials/UofC_2013-07-29-uc3/setup.sh
===================================================================
--- SwiftTutorials/UofC_2013-07-29-uc3/setup.sh	2013-07-29 20:46:09 UTC (rev 6682)
+++ SwiftTutorials/UofC_2013-07-29-uc3/setup.sh	2013-07-29 21:03:07 UTC (rev 6683)
@@ -1,9 +1,5 @@
-#export SBATCH_RESERVATION=osg  # for Midway 
-
 export SWIFT_HEAP_MAX=4G
 
-# SWIFTREL=/home/wilde/swift/src/0.94/cog/modules/swift/dist/rc5.1/bin
-
 if which swift >& /dev/null; then
   :
 else
@@ -21,9 +17,9 @@
 which swift
 swift -version
 
-# export PATHPREFIX="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../bin" && pwd )"
-# echo
-# echo   Setting PATHPREFIX=$PATHPREFIX
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo Adding $DIR to PATH:
+PATH=$DIR:$PATH
 
 if [ -e $HOME/.swift ]; then
   savedotswift=$(mktemp -d $HOME/.swift.save.XXXX)
@@ -37,8 +33,8 @@
 
 # Properties for Swift Tutorial 
 
-sites.file=$HOME/.swift/sites.xml
-tc.file=$HOME/.swift/apps
+sites.file=sites.xml
+tc.file=apps
 
 wrapperlog.always.transfer=true
 sitedir.keep=true




More information about the Swift-commit mailing list