Fix a few inconsistencies

scripts/zmap_developer.sh

@@ -3,10 +3,16 @@
 # ================= README ==================
 
 # This is a  development version of zmap_overnight.sh that  can be run
-# to test the build.
+# to  test the  build. There's  no cvs  updating to  worry  about, nor
+# emailing...
 
+# It does build the documentation,  so is slower. No other config from
+# build_config.sh is altered either so will run like zmap_overnight.sh
+# does.
 
+# Output will be in RELEASE_LOCATION= directory. N.B. ~ == ~zmap
 
+# We set the ZMAP_MASTER_BUILD_DEVELOPMENT_DIR
 
 
 # ================== CONFIG ================== 
@@ -16,8 +22,10 @@ SRC_MACHINE=tviewsrv
 CVS_CHECKOUT_SCRIPT=./build_bootstrap.sh
 
 HOSTNAME=$(hostname)
+cd $(dirname $0)
 SCRIPT_DIR=$(pwd)
 
+
 (cat <<EOF
 #!/bin/echo Generated by $0 
 echo Development script, Not for production!

scripts/zmap_functions.sh

@@ -343,7 +343,7 @@ function zmap_write_cluster_config
 	if [ "x$ZMAP_BUILD_MACHINES" != "x" ]; then
 	    HOSTNAMES=""
 	    for cluster in $ZMAP_BUILD_MACHINES ; do
-		TMP=$(ssh $ZMAP_SSH_OPTIONS $cluster 'hostname')
+		TMP=$(ssh $ZMAP_SSH_OPTIONS $cluster 'hostname' 2>/dev/null)
 		HOSTNAMES="$HOSTNAMES $TMP"
 	    done
 	    ZMAP_BUILD_MACHINES=$HOSTNAMES

scripts/zmap_test_suite.sh

@@ -64,6 +64,15 @@ X_APP=xlogo
 # uncomment the next line while testing...
 #X_APP=xlogo
 
+# Need an exit function that kills $X_APP first
+# Usage: zmap_message_kill_exit "message"
+function zmap_message_kill_exit
+{
+    zmap_message_err "Running 'killall -9 $X_APP'"
+    killall -9 $X_APP
+    zmap_message_exit "$@"
+}
+
 # print out lots of information here.
 # DISPLAY=$DISPLAY
 # XAUTHORITY=$XAUTHORITY
@@ -132,7 +141,7 @@ CONTEXT_FORMAT=context
 # The zmap config file that zmap reads
 
 # N.B. Substitution _will_ occur in this HERE doc.
-cat <<EOF > $ZMAP_CONFIG || zmap_message_exit "Failed to write '$ZMAP_CONFIG'"
+cat <<EOF > $ZMAP_CONFIG || zmap_message_kill_exit "Failed to write '$ZMAP_CONFIG'"
 # Generated by $0
 [ZMap]
 show_mainwindow=true
@@ -143,7 +152,7 @@ EOF
 # The config file the xremote_gui reads
 
 # N.B. Substitution _will_ occur in this HERE doc.
-cat <<EOF > $CONFIG_FILE || zmap_message_exit "Failed to write '$CONFIG_FILE'"
+cat <<EOF > $CONFIG_FILE || zmap_message_kill_exit "Failed to write '$CONFIG_FILE'"
 # Generated by $0
 [programs]
 zmap-exe=$PROGRAM_PATH/zmap
@@ -157,7 +166,7 @@ EOF
 # The command file that xremote_gui reads
 
 # N.B. Substitution _will_ occur in this HERE doc.
-cat <<EOF > $COMMAND_FILE || zmap_message_exit "Failed to write '$COMMAND_FILE'"
+cat <<EOF > $COMMAND_FILE || zmap_message_kill_exit "Failed to write '$COMMAND_FILE'"
 <zmap action="new_zmap" />
 __EOC__
 <zmap action="new_view">
@@ -189,7 +198,7 @@ zmap_message_out "Running $PROGRAM_PATH/xremote_gui --config-file $CONFIG_FILE -
 
 $PROGRAM_PATH/xremote_gui \
 --config-file $CONFIG_FILE   \
---command-file $COMMAND_FILE || zmap_message_exit "Failed runing xremote_gui"
+--command-file $COMMAND_FILE || zmap_message_kill_exit "Failed runing xremote_gui"
 
 zmap_x11_restore_enviroment