Compare commits

...

3 Commits

Author SHA1 Message Date
Ruben P
2b1b2aca74 Merge d190a60ff7 into 6cd9133a15 2024-08-03 08:06:55 +02:00
dw-0
6cd9133a15 fix: detect RatOS 2.1+ as operating system and exit (#490)
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
2024-07-31 20:30:33 +02: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
3 changed files with 18 additions and 1 deletions

View File

@@ -81,6 +81,7 @@ function kiauh_update_dialog() {
done
}
check_if_ratos
check_euid
init_logfile
set_globals

View File

@@ -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:

View File

@@ -28,6 +28,21 @@ function check_euid() {
fi
}
function check_if_ratos() {
if [[ -n $(which ratos) ]]; then
echo -e "${red}"
top_border
echo -e "| !!! RatOS 2.1 or greater detected !!! |"
echo -e "| |"
echo -e "| KIAUH does currently not support RatOS. |"
echo -e "| If you have any questions, please ask for help on the |"
echo -e "| RatRig Community Discord: https://discord.gg/ratrig |"
bottom_border
echo -e "${white}"
exit 1
fi
}
#================================================#
#============= MESSAGE FORMATTING ===============#
#================================================#