Merge d190a60ff7 into 099d47df2f

fix: revert "refactor(Mobileraker): update companion install script (#431 )" (#432 )
This reverts commit ba1cdb3739.
2025-12-23 15:53:36 +05:00 · 2024-01-29 21:11:49 -07:00 · 2024-01-29 17:17:09 +01:00 · 2024-01-29 17:09:30 +01:00 · 2024-01-23 22:47:37 +01:00 · 2024-01-22 17:57:37 +01:00
2 changed files with 3 additions and 2 deletions
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ prompt and confirm by hitting ENTER.
 <tr>
 <th><img src="https://raw.githubusercontent.com/fluidd-core/fluidd/master/docs/assets/images/logo.svg" alt="Fluidd Logo" height="64"></th>
 <th><img src="https://avatars.githubusercontent.com/u/31575189?v=4" alt="jordanruthe avatar" height="64"></th>
-<th><img src="https://camo.githubusercontent.com/627be7fc67195b626b298af9b9677d7c58e698c67305e54324cffbe06130d4a4/68747470733a2f2f6f63746f7072696e742e6f72672f6173736574732f696d672f6c6f676f2e706e67" alt="OctoPrint Logo" height="64"></th>
+<th><img src="https://raw.githubusercontent.com/OctoPrint/OctoPrint/master/docs/images/octoprint-logo.png" alt="OctoPrint Logo" height="64"></th>
 </tr>
 <tr>
 <th>by <a href="https://github.com/fluidd-core">fluidd-core</a></th>
--- a/resources/gcode_shell_command.py
+++ b/resources/gcode_shell_command.py
@@ -18,6 +18,7 @@ class ShellCommand:
        self.command = shlex.split(cmd)
        self.timeout = config.getfloat('timeout', 2., above=0.)
        self.verbose = config.getboolean('verbose', True)
+        self.terminate = config.getboolean('terminate', True)
        self.proc_fd = None
        self.partial_output = ""
        self.gcode.register_mux_command(
@@ -68,7 +69,7 @@ class ShellCommand:
            if proc.poll() is not None:
                complete = True
                break
-        if not complete:
+        if not complete and self.terminate:
            proc.terminate()
        if self.verbose:
            if self.partial_output:
Author	SHA1	Message	Date
Ruben P	e3784c497b	Merge `d190a60ff7` into `099d47df2f`	2024-01-29 21:11:49 -07:00
dw-0	099d47df2f	fix: revert "refactor(Mobileraker): update companion install script (#431 )" (#432 ) This reverts commit `ba1cdb3739`.	2024-01-29 17:17:09 +01:00
Patrick Schmidt	ba1cdb3739	refactor(Mobileraker): update companion install script (#431 )	2024-01-29 17:09:30 +01:00
Anna	8e7d4db988	fix: OctoPrint logo in README.md (#424 ) * Fix OctoPrint logo in Readme Fixed the broken link to the OctoPrint logo in the Readme under the Sources section. Now uses the logo present in the octoprint docs directory. * Update OctoPrint logo to "raw" cdn link * Changed ?raw=true link to raw.githubusercontent.com --------- Co-authored-by: dw-0 <th33xitus@gmail.com>	2024-01-23 22:47:37 +01:00
jneilliii	8f960495ba	fix: OctoPrint logo in README.md (#423 )	2024-01-22 17:57:37 +01:00
Ruben P	d190a60ff7	add an option to terminate or not subprocess default is true (same behavior as now)	2022-08-29 23:17:51 +02:00