cleaning up config files

[sfa.git] / cmdline / demoAggregate.sh

diff --git a/cmdline/demoAggregate.sh b/cmdline/demoAggregate.sh
index 9749d3b..14e50c2 100644 (file)
--- a/cmdline/demoAggregate.sh
+++ b/cmdline/demoAggregate.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-source configSfi.sh
+export PATH=$PATH:/etc/geni
+source config_sfi
+CWD=$(pwd)
 
-CWD=`pwd`
 DEMO_AUTH='planetlab.us'
 DEMO_PL_AUTH='planetlab.us.pl'
 
@@ -10,45 +11,45 @@ echo XXXXX ------------------------------------------------
 echo XXXXX list contents of authority
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py list $DEMO_PL_AUTH
+python $(CWD)/sfi.py list $DEMO_PL_AUTH
 
 echo XXXXX ------------------------------------------------
 echo XXXXX show contents of authority
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py show $DEMO_PL_AUTH
+python $(CWD)/sfi.py show $DEMO_PL_AUTH
 
 
 echo XXXXX ------------------------------------------------
 echo XXXXX show users authority
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py show $DEMO_PL_AUTH
+python $(CWD)/sfi.py show $DEMO_PL_AUTH
 
 echo XXXXX ------------------------------------------------
 echo XXXXX list available node +rspec+
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py nodes
+python $(CWD)/sfi.py nodes
 
 echo XXXXX ------------------------------------------------
 echo XXXXX list available node +dns+
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py nodes dns
+python $(CWD)/sfi.py nodes dns
 
 echo XXXXX ------------------------------------------------
 echo XXXXX list slices at the aggregate
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py slices 
+python $(CWD)/sfi.py slices 
 
 
 echo XXXXX ------------------------------------------------
 echo XXXXX list resources being used by pl_tmack
 echo XXXXX ------------------------------------------------
 
-python ./sfi.py resources planetlab.us.pl.tmack
+python $(CWD)/sfi.py resources planetlab.us.pl.tmack