updated .gitignore (no more includes ejb project, please keep it separated)

diff --git a/.gitignore b/.gitignore
index 51ac39e6f29f103367ad7ef80db8d1f8a7b28ed8..c5bf3164c956f4b481accecd79f44acb5ff3ba30 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,5 @@
 /dist/
 /data/*
 /*.properties
-/*-ejb/nbproject/private/
-/*-ejb/nbproject/*~
-/*-ejb/build/
-/*-ejb/dist/
+.~lock*
+.gitcommits

diff --git a/dist.sh b/dist.sh
index 8d5e1ccb04fa6a5f0ff80cce42a6cbc8d952641b..58d917f92024ee2326b909ed17a6c2232f4bc602 100755 (executable)
--- a/dist.sh
+++ b/dist.sh
@@ -69,7 +69,7 @@ do
 
 done
 
-if [ -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
+if [ "$1" != "r" -a -n "${GLASSFISH_SSH_PATH}" -a -n "${GLASSFISH_SSH_SERVER}" ]
 then
        echo "$0: Copying to remote '${GLASSFISH_SSH_SERVER}' ..."
        scp "${DIST}" "${GLASSFISH_SSH_SERVER}:${GLASSFISH_SSH_PATH}"