From 77ad21bfcf8f9e1961df6ed28b3075e8922705db Mon Sep 17 00:00:00 2001 From: Tony Scelfo Date: Thu, 28 Dec 2023 15:07:43 -0700 Subject: [PATCH 1/3] Update status.py to use the configured bashhub host --- bashhub/view/status.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bashhub/view/status.py b/bashhub/view/status.py index 8dce447..769559a 100644 --- a/bashhub/view/status.py +++ b/bashhub/view/status.py @@ -1,23 +1,24 @@ import dateutil.parser import datetime import humanize +from ..bashhub_globals import BH_URL status_view = """\ === Bashhub Status -https://bashhub.com/{0} -Total Commands: {1} -Total Sessions: {2} -Total Systems: {3} +{0}{1} +Total Commands: {2} +Total Sessions: {3} +Total Systems: {4} === -Session PID {4} Started {5} -Commands In Session: {6} -Commands Today: {7} +Session PID {5} Started {6} +Commands In Session: {7} +Commands Today: {8} """ def build_status_view(model): date = datetime.datetime.fromtimestamp(model.session_start_time / 1000.0) date_str = humanize.naturaltime(date) return status_view.format( - model.username, model.total_commands, model.total_sessions, + BH_URL, model.username, model.total_commands, model.total_sessions, model.total_systems, model.session_name, date_str, model.session_total_commands, model.total_commands_today) From 8a7153795c67a6b087431b28f8c35bcf251ca747 Mon Sep 17 00:00:00 2001 From: Tony Scelfo Date: Thu, 28 Dec 2023 15:08:33 -0700 Subject: [PATCH 2/3] Update status.py --- bashhub/view/status.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bashhub/view/status.py b/bashhub/view/status.py index 769559a..ca46862 100644 --- a/bashhub/view/status.py +++ b/bashhub/view/status.py @@ -5,7 +5,7 @@ status_view = """\ === Bashhub Status -{0}{1} +{0}/{1} Total Commands: {2} Total Sessions: {3} Total Systems: {4} From f1d90be8a74b1dd445b97d3a3ee91781d58fe1c4 Mon Sep 17 00:00:00 2001 From: Tony Scelfo Date: Thu, 28 Dec 2023 15:27:39 -0700 Subject: [PATCH 3/3] Update bashhub_setup.py --- bashhub/bashhub_setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bashhub/bashhub_setup.py b/bashhub/bashhub_setup.py index 764f5ae..1914f2d 100755 --- a/bashhub/bashhub_setup.py +++ b/bashhub/bashhub_setup.py @@ -176,6 +176,7 @@ def main(): print(ascii_art) print("Welcome to bashhub setup!") + print(BH_URL) is_new_user = query_yes_no("Are you a new user?") # Initialize variaous Credentials for logging in.