unconditionally tee output to the terminal

myk002 · myk002 · commit 65ace24a297b · 2022-09-06T12:13:31.000-07:00
so there is a record of the output, and also so that output
can be copied, if desired
diff --git a/docs/gui/launcher.rst b/docs/gui/launcher.rst
@@ -6,37 +6,39 @@ gui/launcher
     :tags: dfhack
 
 This tool is the primary GUI interface for running DFHack commands. You can open
-it from any screen with the \` hotkey. If you opened it by mistake, tap \` again
-to close.
+it from any screen with the \` hotkey. Tap \` again (or hit :kbd:`Esc`) to
+close.
 
-Usage::
+Usage
+-----
+
+::
 
     gui/launcher [initial commandline]
 
 Examples
 --------
 
-- ``gui/launcher``
-    Opens the launcher dialog with the default help message.
-- ``gui/launcher prospect --show ores,veins``
-    Opens the launcher dialog with the given command visible in the edit area,
-    ready for modification or running. Commands related to the ``prospect``
-    command will appear in the autocomplete list, and help text for the
-    ``prospect`` command will be displayed in the help area.
+``gui/launcher``
+    Open the launcher dialog with a blank initial commandline.
+``gui/launcher prospect --show ores,veins``
+    Open the launcher dialog with the edit area pre-populated with the given
+    command, ready for modification or running. Tools related to ``prospect``
+    will appear in the autocomplete list, and help text for ``prospect`` will be
+    displayed in the help area.
 
 Editing and running commands
 ----------------------------
 
 Enter the command you want to run by typing its name. If you want to start over,
 :kbd:`Ctrl`:kbd:`C` will clear the line. When you are happy with the command,
 hit :kbd:`Enter` or click on the ``run`` button to run it. Any output from the
-command will appear in the help area. If you want to run the command and close
-the dialog so you can get back to the game, use :kbd:`Shift`:kbd:`Enter` or hold
-down the :kbd:`Shift` key and click on the ``run`` button instead. The dialog
-also closes automatically if you run a command that brings up a new GUI screen.
-In either case, if the launcher window doesn't come back up to show the command
-output, then the command output (if any) will appear in the DFHack terminal
-console.
+command will appear in the help area. If you want to run the command but close
+the dialog immediately so you can get back to the game, use
+:kbd:`Shift`:kbd:`Enter` or hold down the :kbd:`Shift` key and click on the
+``run`` button instead. The dialog also closes automatically if you run a
+command that brings up a new GUI screen. In any case, the command output will
+also be written to the DFHack terminal console.
 
 Autocomplete
 ------------
@@ -67,7 +69,7 @@ Command history
 ``gui/launcher`` keeps a history of commands you have run to let you quickly run
 those commands again. You can scroll through your command history with the
 :kbd:`Up` and :kbd:`Down` cursor keys, or you can search your history for
-something specific with the :kbd:`Alt`:kbd:`S` hotkey. After you hit
+something specific with the :kbd:`Alt`:kbd:`S` hotkey. When you hit
 :kbd:`Alt`:kbd:`S`, start typing to search your history for a match. To find the
 next match for what you've already typed, hit :kbd:`Alt`:kbd:`S` again. You can
 run the matched command immediately with :kbd:`Enter` (or
diff --git a/gui/launcher.lua b/gui/launcher.lua
@@ -537,18 +537,18 @@ local function safe_run(reappear, command, prev_parent_focus)
     -- hotkey guards and tools that detect the top viewscreen to work reliably.
     script.sleep(2, 'frames')
     local output = dfhack.run_command_silent(command)
+    if #output > 0 then
+        print('Output from command run from gui/launcher:')
+        print('> ' .. command)
+        print()
+        print(output)
+    end
     -- if we displayed a new dfhack screen, don't come back up even if reappear
     -- is true. otherwise, the user can't interact with the new screen. if we're
     -- not reappearing with the output, print the output to the console.
     local parent_focus = dfhack.gui.getCurFocus(true)
     if not reappear or (parent_focus:startswith('dfhack/') and
                         parent_focus ~= prev_parent_focus) then
-        if #output > 0 then
-            print('Output from command run from gui/launcher:')
-            print('> ' .. command)
-            print()
-            print(output)
-        end
         return
     end
     -- reappear and show the command output
