Index: all.sh =================================================================== --- all.sh (revision 19) +++ all.sh (working copy) @@ -21,7 +21,7 @@ LOG="$LOGDIR/$LOG" fi -LD_COMMAND="export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR/../program/librescue:$DIR/../program/civilian/lib" +LD_COMMAND="export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR/../programs/librescue:$DIR/../programs/civilian/lib" OPTIONS="--mapdir $MAP --config $DIR/config.txt" @@ -45,4 +45,4 @@ sleep 2 -echo "Start your agents" \ No newline at end of file +echo "Start your agents" Index: 5firesimulator.sh =================================================================== --- 5firesimulator.sh (revision 19) +++ 5firesimulator.sh (working copy) @@ -1,5 +1,5 @@ #! /bin/sh DIR=`dirname $0` -cd $DIR/../program/firesimulator/resq_firesimulator/ +cd $DIR/../programs/firesimulator/resq_firesimulator/ java -cp . Main -cstp $DIR/config.txt -stp default.stp -p 7000 Index: 6blockadessimulator.sh =================================================================== --- 6blockadessimulator.sh (revision 19) +++ 6blockadessimulator.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -$DIR/../program/blockadessimulator/blockadessimulator $* +$DIR/../programs/blockadessimulator/blockadessimulator $* Index: 3miscsimulator.sh =================================================================== --- 3miscsimulator.sh (revision 19) +++ 3miscsimulator.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -$DIR/../program/miscsimulator/miscsimulator $* +$DIR/../programs/miscsimulator/miscsimulator $* Index: 2viewer.sh =================================================================== --- 2viewer.sh (revision 19) +++ 2viewer.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -java -Xmx128m -cp $DIR/../program/viewer/:$DIR/../program/ viewer.Main -h localhost -p 7000 $* +java -Xmx128m -cp $DIR/../programs/viewer/:$DIR/../programs/ viewer.Main -h localhost -p 7000 $* Index: 8civilian.sh =================================================================== --- 8civilian.sh (revision 19) +++ 8civilian.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -${DIR}/../program/simplecivilian/simplecivilian $* +${DIR}/../programs/civilian/simplecivilian $* Index: 4morimototrafficsimulator.sh =================================================================== --- 4morimototrafficsimulator.sh (revision 19) +++ 4morimototrafficsimulator.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -java -cp $DIR/../program/ traffic.Main localhost 7000 $* +java -cp $DIR/../programs/ traffic.Main localhost 7000 $* Index: 7collapsesimulator.sh =================================================================== --- 7collapsesimulator.sh (revision 19) +++ 7collapsesimulator.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -$DIR/../program/collapsesimulator/collapsesimulator $* +$DIR/../programs/collapsesimulator/collapsesimulator $* Index: all2.sh =================================================================== --- all2.sh (revision 19) +++ all2.sh (working copy) @@ -37,7 +37,7 @@ LOG="$LOGDIR/$LOG" fi -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR/../program/librescue:$DIR/../program/civilian/lib +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$DIR/../programs/librescue:$DIR/../programs/civilian/lib OPTIONS="-logname $LOG -shindopolydata $MAP/shindopolydata.dat -galpolydata $MAP/galpolydata.dat" Index: sampleagent.sh =================================================================== --- sampleagent.sh (revision 19) +++ sampleagent.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh -DIR=`dirname $0`/../program +DIR=`dirname $0`/../programs java -Xmx256m -cp $DIR/ rescuecore.Launch localhost 7000 "0 rescuecore.DummyAgent" Index: 2kuwataviewer.sh =================================================================== --- 2kuwataviewer.sh (revision 19) +++ 2kuwataviewer.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -java -Xmx128m -cp $DIR/../program/kuwataviewer/LV153.jar viewer.Map -h localhost $* +java -Xmx128m -cp $DIR/../programs/kuwataviewer/LV153.jar viewer.Map -h localhost $* Index: 1kernel.sh =================================================================== --- 1kernel.sh (revision 19) +++ 1kernel.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -$DIR/../program/kernel/kernel $* +$DIR/../programs/kernel/kernel $* Index: 0gis.sh =================================================================== --- 0gis.sh (revision 19) +++ 0gis.sh (working copy) @@ -1,3 +1,3 @@ #! /bin/sh DIR=`dirname $0` -$DIR/../program/gis/gis $* +$DIR/../programs/gis/gis $* Index: logviewer.sh =================================================================== --- logviewer.sh (revision 19) +++ logviewer.sh (working copy) @@ -6,4 +6,4 @@ fi DIR=`dirname $0` -java -Xmx128m -cp $DIR/../program/viewer/ viewer.Main -l $* +java -Xmx128m -cp $DIR/../programs/viewer/ viewer.Main -l $*