Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="generator" content="AsciiDoc 8.6.7">
+<meta name="generator" content="AsciiDoc 9.0.0rc1">
 <title>The Megatest Users Manual</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
 
 /* Default font. */
@@ -84,14 +84,20 @@
   margin-top: 0;
 }
 ul > li     { color: #aaa; }
 ul > li > * { color: black; }
 
-pre {
+.monospaced, code, pre {
+  font-family: "Courier New", Courier, monospace;
+  font-size: inherit;
+  color: navy;
   padding: 0;
   margin: 0;
 }
+pre {
+  white-space: pre-wrap;
+}
 
 #author {
   color: #527bbd;
   font-weight: bold;
   font-size: 1.1em;
@@ -216,11 +222,11 @@
   border-left: 3px solid #dddddd;
   padding-left: 0.5em;
 }
 
 div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
 a.image:visited { color: white; }
 
 dl {
   margin-top: 0.8em;
   margin-bottom: 0.8em;
@@ -412,16 +418,10 @@
 /*
  * xhtml11 specific
  *
  * */
 
-tt {
-  font-family: "Courier New", Courier, monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 div.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
 }
 div.tableblock > table {
@@ -432,11 +432,11 @@
   color: #527bbd;
 }
 p.table {
   margin-top: 0;
 }
-/* Because the table frame attribute is overriden by CSS in most browsers. */
+/* Because the table frame attribute is overridden by CSS in most browsers. */
 div.tableblock > table[frame="void"] {
   border-style: none;
 }
 div.tableblock > table[frame="hsides"] {
   border-left-style: none;
@@ -451,16 +451,10 @@
 /*
  * html5 specific
  *
  * */
 
-.monospaced {
-  font-family: "Courier New", Courier, monospace;
-  font-size: inherit;
-  color: navy;
-}
-
 table.tableblock {
   margin-top: 1.0em;
   margin-bottom: 1.5em;
 }
 thead, p.tableblock.header {
@@ -536,10 +530,12 @@
 }
 
 @media print {
   body.manpage div#toc { display: none; }
 }
+
+
 @media screen {
   body {
     max-width: 50em; /* approximately 80 characters wide */
     margin-left: 16em;
   }
@@ -2340,11 +2336,11 @@
 <div class="sect2">
 <h3 id="_trim_trailing_spaces">Trim trailing spaces</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="/nfs/pdx/disks/ice.disk.002/icfadm/pkgs/asciidoc/8.6.7/images/icons/note.png" alt="Note">
+<img src="/usr/images/icons/note.png" alt="Note">
 </td>
 <td class="content">As of Megatest version v1.6548 trim-trailing-spaces defaults to yes.</td>
 </tr></table>
 </div>
 <div class="listingblock">
@@ -2657,11 +2653,11 @@
 waiton test1 test2</pre>
 </div></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="/nfs/pdx/disks/ice.disk.002/icfadm/pkgs/asciidoc/8.6.7/images/icons/note.png" alt="Note">
+<img src="/usr/images/icons/note.png" alt="Note">
 </td>
 <td class="content">Dynamic waiton lists must be capable of being calculated at the
 beginning of a run. This is because Megatest walks the tree of waitons
 to create the list of tests to execute.</td>
 </tr></table>
@@ -3011,10 +3007,19 @@
 </div></div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_ezsteps">Ezsteps</h3>
+<div class="paragraph"><p>Ezsteps is the recommended way to implement tests and automation in Megatest.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="/usr/images/icons/note.png" alt="Note">
+</td>
+<td class="content">Each ezstep must be a single line. Use the [scripts] mechanism to create multiline scripts (see example below).</td>
+</tr></table>
+</div>
 <div class="listingblock">
 <div class="title">Example ezsteps with logpro rules</div>
 <div class="content monospaced">
 <pre>[ezsteps]
 lookittmp   ls /tmp
@@ -3022,35 +3027,56 @@
 [logpro]
 lookittmp ;; Note: config file format supports multi-line entries where leading whitespace is removed from each line
   ;;     a blank line indicates the end of the block of text
   (expect:required in "LogFileBody" &gt; 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)</pre>
 </div></div>
-<div class="paragraph"><p>To transfer the environment to the next step you can do the following:</p></div>
-<div class="listingblock">
-<div class="title">Propagate environment to next step</div>
-<div class="content monospaced">
-<pre>$MT_MEGATEST -env2file .ezsteps/${stepname}</pre>
-</div></div>
 <div class="sect3">
 <h4 id="_automatic_environment_propagation_with_ezsteps">Automatic environment propagation with Ezsteps</h4>
-<div class="paragraph"><p>Simply give your step name an extension of .sh or .csh. The environment variables will be propagated.</p></div>
+<div class="paragraph"><p>Turn on ezpropvars or simply give your step name an extension of .sh or .csh. The environment variables will be propagated.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="/nfs/pdx/disks/ice.disk.002/icfadm/pkgs/asciidoc/8.6.7/images/icons/note.png" alt="Note">
+<img src="/usr/images/icons/note.png" alt="Note">
 </td>
 <td class="content">aliases and variables with strange whitespace or characters will not propagate correctly. Put in a ticket on the <a href="http://www.kiatoa.com/fossils/megatest">http://www.kiatoa.com/fossils/megatest</a> site if you need support for a specific strange character combination.</td>
 </tr></table>
 </div>
 <div class="listingblock">
-<div class="title">Example of auto propagation</div>
+<div class="title">Turn on auto propagate for bash</div>
+<div class="content monospaced">
+<pre>[setup]
+ezpropvars sh /bin/bash</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">Turn on auto propagate for csh</div>
+<div class="content monospaced">
+<pre>[setup]
+ezpropvars csh /bin/csh</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">Example of auto propagation using extensions</div>
 <div class="content monospaced">
 <pre>[ezsteps]
 step1.sh export SOMEVAR=$(ps -def | wc -l);ls /tmp
 # The next step will get the value of $SOMEVAR from step1.sh
 step2.sh echo $SOMEVAR</pre>
 </div></div>
+<div class="listingblock">
+<div class="title">Example of multi-line script</div>
+<div class="content monospaced">
+<pre>[scripts]
+tarresults tar cfvz $DEST/srcdir1.tar.gz srcdir1
+  tar cfvz $DEST/srcdir2.tar.gz srcdir2
+
+[setup]
+ezpropvars sh
+
+[ezsteps]
+step1 DEST=/tmp/targz;source tarresults</pre>
+</div></div>
+<div class="paragraph"><p>The above example will result in files; tarresults and ez_step1 being
+created in the test dir.</p></div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_scripts">Scripts</h3>
 <div class="listingblock">
@@ -3182,11 +3208,11 @@
 COMPLETED/ xterm -e bash -s --</pre>
 </div></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="/nfs/pdx/disks/ice.disk.002/icfadm/pkgs/asciidoc/8.6.7/images/icons/note.png" alt="Note">
+<img src="/usr/images/icons/note.png" alt="Note">
 </td>
 <td class="content">There is a trailing space after the double-dash</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>There are a number of environment variables available to the trigger script
@@ -3519,10 +3545,11 @@
 </div>
 <div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
 Version 1.5<br>
-Last updated 2020-10-13 21:24:33 PDT
+Last updated
+ 2020-10-11 21:26:10 MST
 </div>
 </div>
 </body>
 </html>

Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -724,10 +724,14 @@
 ---------------------------
 
 Ezsteps
 ~~~~~~~
 
+Ezsteps is the recommended way to implement tests and automation in Megatest.
+
+NOTE: Each ezstep must be a single line. Use the [scripts] mechanism to create multiline scripts (see example below).
+
 .Example ezsteps with logpro rules
 -----------------
 [ezsteps]
 lookittmp   ls /tmp
 
@@ -736,31 +740,52 @@
   ;;     a blank line indicates the end of the block of text 
   (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
 
 -----------------
 
-To transfer the environment to the next step you can do the following:
-
-.Propagate environment to next step
-----------------------------
-$MT_MEGATEST -env2file .ezsteps/${stepname}	  
-----------------------------
-
 Automatic environment propagation with Ezsteps
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Simply give your step name an extension of .sh or .csh. The environment variables will be propagated.
+Turn on ezpropvars or simply give your step name an extension of .sh or .csh. The environment variables will be propagated.
 
 NOTE: aliases and variables with strange whitespace or characters will not propagate correctly. Put in a ticket on the http://www.kiatoa.com/fossils/megatest site if you need support for a specific strange character combination.
 
-.Example of auto propagation
+.Turn on auto propagate for bash
+---------------------------
+[setup]
+ezpropvars sh /bin/bash
+---------------------------
+
+.Turn on auto propagate for csh
+---------------------------
+[setup]
+ezpropvars csh /bin/csh
+---------------------------
+
+.Example of auto propagation using extensions
 ---------------------------
 [ezsteps]
 step1.sh export SOMEVAR=$(ps -def | wc -l);ls /tmp
 # The next step will get the value of $SOMEVAR from step1.sh
 step2.sh echo $SOMEVAR
 ---------------------------
+
+.Example of multi-line script
+---------------------------
+[scripts]
+tarresults tar cfvz $DEST/srcdir1.tar.gz srcdir1
+  tar cfvz $DEST/srcdir2.tar.gz srcdir2
+
+[setup]
+ezpropvars sh
+
+[ezsteps]
+step1 DEST=/tmp/targz;source tarresults
+---------------------------
+
+The above example will result in files; tarresults and ez_step1 being
+created in the test dir.
 
 Scripts
 ~~~~~~~
 
 .Specifying scripts inline (best used for only simple scripts)

Index: docs/manual/server.png
==================================================================
--- docs/manual/server.png
+++ docs/manual/server.png
cannot compute difference between binary files

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -32,50 +32,84 @@
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
+
 
 (define (ezsteps:step-name->mode stepname)
   (match (string-search "\\.([^\\.]+)$" stepname)
     ((_ ext) (string->symbol ext))
     (else    #f)))
 
-(define (ezsteps:create-step-script envdbf stepname prevstepname mode cmd)
-  (let* ((shebang (case mode
+(define (ezsteps:create-step-script envdbf stepname prevstepname mode cmd shellexe)
+  (let* (#;(shebang (case mode
 		    ((sh)  "/bin/sh")
 		    ((csh) "/bin/csh")
 		    (else  "/bin/bash")))
-	 (sourcef (conc ".ezsteps/" prevstepname))
-	 (scriptn stepname)) ;; remember the name already has an extension .sh, .csh etc.
+	 (sourcef (conc ".ezsteps/vars_" prevstepname "." mode))
+	 (scriptn (conc "ez_" stepname))) ;; remember the name already has an extension .sh, .csh etc.
     (with-output-to-file scriptn
       (lambda ()
 	;; the shebang line
-	(print "#!" shebang "\n")
+	(print "#!" shellexe)
 	;; first setup the source of the previous changes
 	(if (file-exists? sourcef)
 	    (print "source " sourcef))
 	;; save the env at start
 	(print "megatest -envcap "stepname"_start "envdbf)
 	;; run the command
-	(print cmd "\necode=$?")
+	(print cmd)
+	(if (eq? mode 'csh)
+	    (print "set ecode=$?")
+	    (print "ecode=$?"))
 	;; save the env at end
 	(print "megatest -envcap "stepname"_end "envdbf)
 	;; write the delta
-	(print "megatest -envdelta "stepname"_start-"stepname"_end -dumpmode bash -o .ezsteps/"stepname" "envdbf)
+	(print "megatest -envdelta "stepname"_start-"stepname"_end -dumpmode bash -o .ezsteps/vars_"stepname".sh "envdbf)
+	(print "megatest -envdelta "stepname"_start-"stepname"_end -dumpmode csh -o .ezsteps/vars_"stepname".csh "envdbf)
 	(print "exit $ecode")))
     (system (conc "chmod a+x " scriptn))))
 
-;; 
+(define (ezsteps:get-ezpropvars res) ;; testconfig)
+  ;; (let* ((res (configf:lookup testconfig "setup" "ezpropvars")))
+    (if (string? res)
+	(let* ((dat (string-split res)))
+	  (match dat
+	    ((s shellexe)
+	     (let ((shl (string->symbol s)))
+	       `(,shl . ,shellexe)))
+	    ((s)
+	     (let* ((shl      (string->symbol s))
+		    (shellexe (if (eq? shl 'csh) "/bin/csh" "/bin/bash")))
+	       `(,shl . ,shellexe)))
+	    (else #f)))
+	#f))
+
+;; NOTE: returns logpro-used?
+;;
 (define (launch:runstep ezstep run-id test-id exit-info m tal testconfig all-steps-dat prevstepname envdbf)
   (let* ((stepname       (car ezstep))  ;; do stuff to run the step
-	 (stepmode       (ezsteps:step-name->mode stepname))
+	 (stepmode-n     (ezsteps:step-name->mode stepname))
 	 (stepinfo       (cadr ezstep))
-	;; (let ((info (cadr ezstep)))
-	;; 		   (if (proc? info) "" info)))
-	;; (stepproc       (let ((info (cadr ezstep)))
-	;; 		   (if (proc? info) info #f)))
+	 (shellmode      (ezsteps:get-ezpropvars  (configf:lookup testconfig "setup" "ezpropvars"))) ;; returns '(csh|sh . "/path/to/shell")
+	 (stepmode       (if stepmode-n ;; the .sh or .csh always wins
+			     stepmode-n
+			     (if shellmode
+				 (car shellmode)
+				 #f)))
+	 (shellexe       (if stepmode-n
+			     (case stepmode
+			       ((csh) "/bin/csh")
+			       (else  "/bin/bash"))
+			     (if shellmode
+				 (cdr shellmode)
+				 "/bin/bash")))
+	 ;; (let ((info (cadr ezstep)))
+	 ;; 		   (if (proc? info) "" info)))
+	 ;; (stepproc       (let ((info (cadr ezstep)))
+	 ;; 		   (if (proc? info) info #f)))
 	 (stepparts      (string-match (regexp "^(\\{([^\\}\\{]*)\\}\\s*|)(.*)$") stepinfo))
 	 (stepparams     (if (and (list? stepparts)
 				  (> (length stepparts) 1))
 			     (list-ref stepparts 2)
 			     #f)) ;; for future use, {VAR=1,2,3}, run step for each
@@ -111,11 +145,11 @@
     ;; NB// can safely assume we are in test-area directory
     (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo
 		 " stepparts: " stepparts
 		 " stepparams: " stepparams " stepcmd: " stepcmd)
 
-    (if stepmode (ezsteps:create-step-script envdbf stepname prevstepname stepmode stepcmd))
+    (if stepmode (ezsteps:create-step-script envdbf stepname prevstepname stepmode stepcmd shellexe))
 
     ;; ;; first source the previous environment
     ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") 
     ;;      							 (get-environment-variable "SHELL")) ".csh" ".sh"))))
     ;;   (if (and prevstep (common:file-exists? prev-env))
@@ -129,11 +163,11 @@
     ;; now launch the actual process
     (call-with-environment-variables 
      (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
      (lambda () ;; (process-run "/bin/bash" "-c" "exec ls -l /tmp/foobar > /tmp/delme-more.log 2>&1")
        (let* ((cmd (conc (if stepmode
-			     stepname
+			     (conc "ez_" stepname)
 			     stepcmd)
 			 " > " stepname ".log 2>&1")) ;; >outfile 2>&1 
 	      (pid #f))
 	 (let ((proc (lambda ()
 		       (set! pid (process-run "/bin/bash" (list "-c" cmd))))))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -1548,12 +1548,11 @@
 			      (append (list (list "MT_TEST_RUN_DIR" work-area)
 					    (list "MT_TEST_NAME" test-name)
 					    (list "MT_ITEM_INFO" (conc itemdat)) 
 					    (list "MT_RUNNAME"   runname)
 					    (list "MT_TARGET"    mt_target)
-					    (list "MT_ITEMPATH"  item-path)
-					    )
+					    (list "MT_ITEMPATH"  item-path))
 				      itemdat)))
 	     (testprevvals   (alist->env-vars
 			      (hash-table-ref/default tconfig "pre-launch-env-overrides" '())))
 	     ;; Launchwait defaults to true, must override it to turn off wait
 	     (launchwait     (if (equal? (configf:lookup *configdat* "setup" "launchwait") "no") #f #t))

