diff --git a/meshbook.py b/meshbook.py index 2b30ad6..2e70d0c 100644 --- a/meshbook.py +++ b/meshbook.py @@ -3,6 +3,7 @@ import argparse import asyncio from base64 import b64encode +from colorama import just_fix_windows_console from configparser import ConfigParser import json import meshctrl @@ -282,6 +283,7 @@ async def execute_meshbook(session: meshctrl.Session, targets: dict, meshbook: d console(json.dumps(responses_list), True) async def main(): + just_fix_windows_console() ''' Main function where the program starts. Place from which all comands originate (eventually). ''' @@ -361,7 +363,7 @@ async def main(): case {"devices": candidate_target_name}: target_name = str(candidate_target_name) - console(text_color.yellow + "Executing meshbook on the target(s): " + target_name + ".") + console(text_color.yellow + "Executing meshbook on the target(s): " + text_color.green + target_name + ".") if not args.nograce: console(text_color.yellow + "Initiating grace-period...") diff --git a/os_categories.json b/os_categories.json index 9070307..9213310 100644 --- a/os_categories.json +++ b/os_categories.json @@ -5,10 +5,9 @@ "Debian GNU/Linux 11 (bullseye)" ], "Ubuntu": [ - "Ubuntu 24.04.1 LTS" - ], - "Ubuntu 22": [ - "Ubuntu 22.04.1 LTS" + "Ubuntu 24.04.1 LTS", + "Ubuntu 22.04.5 LTS", + "Ubuntu 20.04.6 LTS" ] }, "MacOS": { diff --git a/requirements.txt b/requirements.txt index c68fc3c..bab4f7a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ asyncio==3.4.3 +colorama==0.4.6 pyyaml==6.0.2 libmeshctrl==1.1.1