diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh
index 525ac864b8a9f91a0ee4fe96efd6a5c1986cf51e..7c7e44bbdb891a4d02f0444084bc1b286f56a8a5 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-SiteFiles.sh
@@ -2,25 +2,28 @@
# script to copy site files
-#fromDir=$HOME/downloads/webtools/testUpdates
-#toDir=$HOME/downloads/webtools/updates
+source ./parseSiteArg.shsource
-fromDir=$HOME/downloads/webtools/declaredUpdates
-toDir=$HOME/downloads/webtools/milestones
-
-cp -f -p -r -v --update $fromDir/*html --target-directory=$toDir/
-cp -f -p -r -v --update $fromDir/*.gif --target-directory=$toDir/
-cp -f -p -r -v --update $fromDir/web --target-directory=$toDir/
-cp -f -p -r -v --update $fromDir/*.xml --target-directory=$toDir/
+cp -f -p -r -v --update ${fromDir}/*html --target-directory=${toDir}/
+cp -f -p -r -v --update ${fromDir}/*.gif --target-directory=${toDir}/
+cp -f -p -r -v --update ${fromDir}/web --target-directory=${toDir}/
+cp -f -p -r -v --update ${fromDir}/*.xml --target-directory=${toDir}/
# TODO ... make this handle 'milestones' or 'updates'
-perl -pi -e 's/webtools\/testUpdates/webtools\/milestones/g' ${toDir}/index.html
-perl -pi -e 's/webtools\/testUpdates/webtools\/milestones/g' ${toDir}/site.xml
+
+fromLastSegment = ${fromDir##*/}
+toLastSegment = ${fromDir##*/}
+
+echo "from: ${fromLastSegment}"
+echo " to: ${toLastSegment}
+
+perl -pi -e 's/webtools\/${fromLastSegment}/webtools\/${toLastSegment}/g' ${toDir}/index.html
+perl -pi -e 's/webtools\/${fromLastSegment}/webtools\/${toLastSegment}/g' ${toDir}/site.xml
# important: make sure digest is updated same time as site.xml's
-# TODO: digest should be recreated on final site
-cp -f -p -r -v --update $fromDir/digest.zip --target-directory=$toDir/
+# TODO: digest should be recreated on final site?
+cp -f -p -r -v --update ${fromDir}/digest.zip --target-directory=${toDir}/
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
index 09a0e75c47d136bbc888d0438ae2104a03e431af..0e8b775c2b3e5923432029e169386473cc6abb50 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/copyToRelease-code.sh
@@ -4,38 +4,7 @@
-
-if [ -z "${1}" ]
-then
-
-echo ""
-echo " Need an argument"
-echo " Usage: ${0} <stream>"
-echo " where <stream> is one of Europa, Callisto"
-echo ""
-exit
-
-
-
-
-elif [ "${1}" = "Europa" ]
-then
- fromDir=${HOME}/downloads/webtools/declaredUpdates
- toDir=${HOME}/downloads/webtools/milestones
-
-elif [ "${1}" = "Callisto" ]
-then
- fromDir=${HOME}/downloads/webtools/testUpdates
- toDir=${HOME}/downloads/webtools/updates
-
-else
- echo ""
- echo " Unrecognized argument: ${1}"
- echo " Usage: ${0} <stream>"
- echo " where <stream> is one of Europa, Callisto"
- echo ""
- exit
-fi
+source ./parseSiteArg.shsource
if [ "${2}" != "-doit" ] ; then
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
index 9868d23cc6fe598e1e6170d584bc3fefabbb89bc..f3b5cad6c3e2838f8e0a24c687b1f1d2741081e6 100644
--- a/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/getWTPUpdateToolsFromCVS.sh
@@ -1,31 +1,31 @@
# This script should be "copied up" and ran from a
# directory "above" the main working directories of
-# $updateToolsDir.
+# ${updateToolsDir}.
# This is typically the users $HOME directory
updateToolsDir=org.eclipse.wtp.releng.webupdatesite
echo " "
-echo " Removing old $updateToolsDir and exporting fresh HEAD versions."
+echo " Removing old ${updateToolsDir} and exporting fresh HEAD versions."
echo " "
-rm -fr $updateToolsDir
+rm -fr ${updateToolsDir}
echo " "
# ISSUE: we should move away from using 'head' version
# Note: we can use "local host" since we are running on the same cluser as the cvs server
# otherwise, if running remotely, localhos should be changed to 'dev.eclpise.org'
-cvs -Q -f -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r HEAD $updateToolsDir
+cvs -Q -f -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r HEAD ${updateToolsDir}
-dos2unix -q $updateToolsDir/build-home/*.sh
-dos2unix -q $updateToolsDir/build-home/*.xml
-chmod -R +x $updateToolsDir/build-home/*.sh
+dos2unix -q ${updateToolsDir}/build-home/*.sh
+dos2unix -q ${updateToolsDir}/build-home/*.xml
+chmod -R +x ${updateToolsDir}/build-home/*.sh
echo " for complete refresh, use something similar to following"
echo " "
-echo " cd $updateToolsDir/build-home/"
+echo " cd ${updateToolsDir}/build-home/"
echo " screen -x"
echo " #for Callisto"
echo " ./runUpdateAllProjects.sh -clean | tee out.txt"
@@ -36,4 +36,6 @@ echo " When complete, be sure to inspect or at least grep the out.txt file fo
echo " grep failed out.txt"
echo " grep error out.txt"
echo " grep exception out.txt"
-echo " "
\ No newline at end of file
+echo " "
+
+cd ${updateToolsDir}/build-home/
diff --git a/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
new file mode 100644
index 0000000000000000000000000000000000000000..a240c8a6c04b7ae9942a1afb32cbc1a7464ad357
--- /dev/null
+++ b/org.eclipse.wtp.releng.webupdatesite/build-home/parseSiteArg.shsource
@@ -0,0 +1,32 @@
+
+if [ -z "${1}" ]
+then
+
+echo ""
+echo " Need an argument"
+echo " Usage: ${0} <stream>"
+echo " where <stream> is one of Europa, Callisto"
+echo ""
+exit
+
+
+
+
+elif [ "${1}" = "Europa" ]
+then
+ fromDir=${HOME}/downloads/webtools/declaredUpdates
+ toDir=${HOME}/downloads/webtools/milestones
+
+elif [ "${1}" = "Callisto" ]
+then
+ fromDir=${HOME}/downloads/webtools/testUpdates
+ toDir=${HOME}/downloads/webtools/updates
+
+else
+ echo ""
+ echo " Unrecognized argument: ${1}"
+ echo " Usage: ${0} <stream>"
+ echo " where <stream> is one of Europa, Callisto"
+ echo ""
+ exit
+fi