From 04627483363db3046f046c8b00ecab067f4e46ea Mon Sep 17 00:00:00 2001 From: j842 Date: Mon, 5 May 2025 14:45:47 +1200 Subject: [PATCH] . --- src/autocomplete.cpp | 4 ++-- src/servers.cpp | 3 ++- src/service_runner.cpp | 3 ++- src/services.cpp | 2 +- src/templates.cpp | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/autocomplete.cpp b/src/autocomplete.cpp index 8c79030..0452435 100644 --- a/src/autocomplete.cpp +++ b/src/autocomplete.cpp @@ -90,11 +90,11 @@ void dropshell::autocomplete_list_commands() // add in commmands hard-coded and handled in main commands.merge(std::set{ - "help","init" // these are always available. + "help","edit" // these are always available. }); if (dropshell::gConfig().is_config_set()) commands.merge(std::set{ - "server","templates","create-service","create-template","create-server","edit","ssh", + "server","templates","create-service","create-template","create-server","ssh", "list" // only if we have a config. }); for (const auto& command : commands) { diff --git a/src/servers.cpp b/src/servers.cpp index 103631e..579b9a4 100644 --- a/src/servers.cpp +++ b/src/servers.cpp @@ -187,7 +187,8 @@ void create_server(const std::string &server_name) // 2. create a new directory in the user config directory auto lsdp = gConfig().get_local_server_definition_paths(); if (lsdp.empty() || lsdp[0].empty()) { - std::cerr << "Error: Local server definition path not found - is DropShell initialised?" << std::endl; + std::cerr << "Error: Local server definition path not found" << std::endl; + std::cerr << "Run 'dropshell edit' to configure DropShell" << std::endl; return; } std::string server_dir = lsdp[0] + "/" + server_name; diff --git a/src/service_runner.cpp b/src/service_runner.cpp index 9197c24..16b687b 100644 --- a/src/service_runner.cpp +++ b/src/service_runner.cpp @@ -627,7 +627,8 @@ bool service_runner::backup(bool silent) { // Create backups directory locally if it doesn't exist std::string local_backups_dir = gConfig().get_local_backup_path(); if (local_backups_dir.empty()) { - std::cerr << "Error: Local backups directory not found - is DropShell initialised?" << std::endl; + std::cerr << "Error: Local backups directory not found" << std::endl; + std::cerr << "Run 'dropshell edit' to configure DropShell" << std::endl; return false; } if (!std::filesystem::exists(local_backups_dir)) diff --git a/src/services.cpp b/src/services.cpp index 43860e7..52d72ad 100644 --- a/src/services.cpp +++ b/src/services.cpp @@ -23,7 +23,7 @@ std::vector get_server_services_info(const std::string& server std::vector local_server_definition_paths = gConfig().get_local_server_definition_paths(); if (local_server_definition_paths.empty()) { std::cerr << "Error: No local server definition paths found" << std::endl; - std::cerr << "Run 'dropshell init' to initialise DropShell" << std::endl; + std::cerr << "Run 'dropshell edit' to configure DropShell" << std::endl; return services; } diff --git a/src/templates.cpp b/src/templates.cpp index dcc2f42..a58123b 100644 --- a/src/templates.cpp +++ b/src/templates.cpp @@ -175,7 +175,7 @@ if (local_server_definition_paths.empty()) { std::cerr << "Error: No local server definition paths found" << std::endl; - std::cerr << "Run 'dropshell init' to initialise DropShell" << std::endl; + std::cerr << "Run 'dropshell edit' to configure DropShell" << std::endl; return; }