Merge branch 'master' into fgh_loadup-vnc

Signed-off-by: Frank Halasz <frank@halasz.org>

scripts/loadups/loadup

@@ -162,6 +162,11 @@ main() {
               # internal
               noendmsg=true
               ;;
+            --forcevnc)
+              # internal - for testing
+              # WSL only -otherwise warning msg from medley
+              force_vnc="+"
+              ;;
             -z | -man | --man )
               if [ "$(uname)" = "Darwin" ]
               then

scripts/loadups/loadup-setup.sh

@@ -161,6 +161,7 @@ loadup_finish () {
   exit ${exit_code}
 }
 
+force_vnc="-"
 run_medley () {
     /bin/sh "${MEDLEYDIR}/scripts/medley/medley.command"         \
              --config -                                          \
@@ -172,6 +173,7 @@ run_medley () {
              --greet "${initfile}"                               \
              --sysout "$1"                                       \
              --vnc "${LOADUP_USE_VNC}"                           \
+             --automation                                        \
              "$2" "$3" "$4" "$5" "$6" "$7"                       ;
     exit_code=$?
 }

scripts/medley/medley.command

@@ -586,6 +586,8 @@ flags:
 
     -x - | --logindir -        : use MEDLEYDIR/logindir as LOGINDIR in Medley
 
+    -am | --automation         : this call to medley is being used in automation, adjust timings.  Relevant in -vnc case only.
+
     -cm FILE | --rem.cm FILE   : use FILE as the REM.CM when starting up Medley.  FILE must be absolute pathname.
 
     -cm - | --rem.cm -         : do not use an REM.CM.  Negate any prior setting, e.g., from config file.
@@ -638,6 +640,7 @@ pixelscale_arg=""
 borderwidth_arg=""
 remcm_arg="${LDEREMCM}"
 repeat_cm=""
+automation=false
 
 # Add marker at end of args so we can accumulate pass-on args in args array
 set -- "$@" "--start_of_pass_args"
@@ -915,6 +918,9 @@ do
         fi
         exit 0
         ;;
+      -am | --automation)
+        automation=true
+        ;;
       -nf | -NF | --nofork)
         # for use in loadups
         case $2 in
@@ -1002,12 +1008,6 @@ do
   shift
 done
 
-# if running on WSL1, force use_vnc
-if [ "${wsl}" = true ] && [ "${wsl_ver}" -eq 1 ]
-then
-  use_vnc=true
-fi
-
 
 # Process run_id
 # if it doesn't end in #, make sure that there is not another instance currently running with this same id
@@ -1702,7 +1702,7 @@ do
                  "$(ip_addr)":"${VNC_PORT}"            \
                  >>"${LOG}" 2>&1                       &
   wait $!
-  if [ $(( $(date +%s) - start_time )) -lt 5 ]
+  if [ "${automation}" = false ] && [ $(( $(date +%s) - start_time )) -lt 5 ]
   then
     if [ -z "$(pgrep -f "Xvnc ${DISPLAY}")" ]
     then

scripts/medley/medley_args.sh

@@ -48,6 +48,7 @@ pixelscale_arg=""
 borderwidth_arg=""
 remcm_arg="${LDEREMCM}"
 repeat_cm=""
+automation=false
 
 # Add marker at end of args so we can accumulate pass-on args in args array
 set -- "$@" "--start_of_pass_args"
@@ -325,6 +326,9 @@ do
         fi
         exit 0
         ;;
+      -am | --automation)
+        automation=true
+        ;;
       -nf | -NF | --nofork)
         # for use in loadups
         case $2 in
@@ -412,9 +416,3 @@ do
   shift
 done
 
-# if running on WSL1, force use_vnc
-if [ "${wsl}" = true ] && [ "${wsl_ver}" -eq 1 ]
-then
-  use_vnc=true
-fi
-

scripts/medley/medley_usage.sh

@@ -115,6 +115,8 @@ flags:
 
     -x - | --logindir -        : use MEDLEYDIR/logindir as LOGINDIR in Medley
 
+    -am | --automation         : this call to medley is being used in automation, adjust timings.  Relevant in -vnc case only.
+
     -cm FILE | --rem.cm FILE   : use FILE as the REM.CM when starting up Medley.  FILE must be absolute pathname.
 
     -cm - | --rem.cm -         : do not use an REM.CM.  Negate any prior setting, e.g., from config file.

scripts/medley/medley_vnc.sh

@@ -215,7 +215,7 @@
                  "$(ip_addr)":"${VNC_PORT}"            \
                  >>"${LOG}" 2>&1                       &
   wait $!
-  if [ $(( $(date +%s) - start_time )) -lt 5 ]
+  if [ "${automation}" = false ] && [ $(( $(date +%s) - start_time )) -lt 5 ]
   then
     if [ -z "$(pgrep -f "Xvnc ${DISPLAY}")" ]
     then