some cleanup and corrections
diff --git a/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh b/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
index 6a3f3d7..c56d68a 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/copyAndRemove.sh
@@ -8,12 +8,12 @@
echo "${oldDir} does not exixt"
return;
fi
+
echo "oldDir: ${oldDir}"
-
-
echo "newDir: ${newDir}"
+
mkdir -p ${newDir}
- rsync --backup --verbose --recursive ${oldDir} ${newDir}
+ rsync --backup --recursive ${oldDir} ${newDir}
if [ "$?" -eq "0" ]
then
rm -fr ${oldDir}
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh b/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
index 68bf826..c73d658 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveCleanup.sh
@@ -11,43 +11,21 @@
. copyAndRemove.sh
-oldBaseDir=${oldcvsdir}/wst/components
-newBaseDir=${newcvsdir}/webtools.releng/tempmisc
+newDir=${newcvsdir}/webtools.releng/tempmisc
-wtpmodule=
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+
+oldDir=${oldcvsdir}/wst/components
copyAndRemove $oldDir $newDir
-oldBaseDir=${oldcvsdir}/jst/components
-newBaseDir=${newcvsdir}/webtools.releng/tempmisc
-
-wtpmodule=
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+oldDir=${oldcvsdir}/jst/components
copyAndRemove $oldDir $newDir
-oldBaseDir=${oldcvsdir}/org.eclipse.wtp
-newBaseDir=${newcvsdir}/webtools.releng/tempmisc
-
-wtpmodule=
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+oldDir=${oldcvsdir}/org.eclipse.wtp
copyAndRemove $oldDir $newDir
-oldBaseDir=${oldcvsdir}/wst
-newBaseDir=${newcvsdir}/webtools.releng/tempmisc
-
-wtpmodule=
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+oldDir=${oldcvsdir}/wst
copyAndRemove $oldDir $newDir
-oldBaseDir=${oldcvsdir}/jst
-newBaseDir=${newcvsdir}/webtools.releng/tempmisc
-
-wtpmodule=
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+oldDir=${oldcvsdir}/jst
copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveall.sh b/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
index e83d253..da9c4f7 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveall.sh
@@ -1,3 +1,9 @@
+#!/bin/sh
+
+# These scripts pretty much have to be ran in this order, to work correctly,
+# since some copy and remove whole sub-trees, where as others copy and remove
+# individual pieces of those subtrees
+
./moverdb.sh
./movecommon.sh
./moveservertools.sh
@@ -8,4 +14,3 @@
./moveejb.sh
./movejee.sh
./moveCleanup.sh
-
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
index f0010e8..cc05a39 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh b/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
index 6b19534..2dc6c55 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
index f572faa..a5bbd17 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movejee.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh b/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
index ac8700e..d3cc192 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movemaps.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
. copyAndRemove.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh b/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
index 6be5bec..2ba3bdd 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moverdb.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
. copyAndRemove.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh b/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
index 157b43b..ba752dd 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movereleng.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
. copyAndRemove.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
index 3d72c0e..6ae96c7 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
. copyAndRemove.sh
@@ -31,11 +32,11 @@
wtpmodule=org.eclipse.wst.server.ui.doc.user
oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
copyAndRemove $oldDir $newDir
wtpmodule=org.eclipse.wst.server.ui.infopop
oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
index 8c5e6d4..2ed17bf 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movesourceediting.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
. mainparams.shsource
. copyAndRemove.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
index 7060982..3a18db1 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movewebservices.sh
@@ -1,3 +1,5 @@
+#!/bin/sh
+
. mainparams.shsource
. copyAndRemove.sh
diff --git a/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh b/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh
index a0331de..dc70e8b 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/snagCommonDirs.sh
@@ -1,4 +1,10 @@
-find /cvsroot/webtools -name org.eclipse.wst.internet.proxy >> oldList.txt
+#!/bin/sh
+
+# This file is not needed on a regular basis, but was used at one point to get the
+# full patch of module names
+
+# first one creates new oldList file, the rest append to it.
+find /cvsroot/webtools -name org.eclipse.wst.internet.proxy > oldList.txt
find /cvsroot/webtools -name org.eclipse.wst.internet.proxy.infopop >> oldList.txt
find /cvsroot/webtools -name org.eclipse.jst.common_core.feature >> oldList.txt
find /cvsroot/webtools -name org.eclipse.jst.common_sdk.feature >> oldList.txt
diff --git a/plugins/org.eclipse.wtp.releng.utilities/treeout.sh b/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
index be7d5b8..82dd3ed 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/treeout.sh
@@ -1,5 +1,8 @@
+#!/bin/sh
+
. mainparams.shsource
+
treeoutput=treeout
mkdir -p ${treeoutput}
wtpproject=common