Fix SSH command quoting and remove duplicate user prompts

- Fix rebuild and backup commands with proper inner command quoting - Remove duplicate "Press any key to close..." from SSH commands since scripts handle it - Clean up SSH terminal command to avoid redundant prompts - Ensure consistent command execution patterns across all SSH operations - Update version to 0.1.91
Implement unified SSH command management with dedicated scripts
2025-11-19 16:08:03 +01:00 · 2025-11-19 15:37:33 +01:00 · 2025-11-19 13:32:04 +01:00 · 2025-11-19 13:21:48 +01:00
6 changed files with 17 additions and 21 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"

 [[package]]
 name = "cm-dashboard"
-version = "0.1.87"
+version = "0.1.91"
 dependencies = [
 "anyhow",
 "chrono",
@@ -301,7 +301,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.87"
+version = "0.1.91"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -324,7 +324,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.87"
+version = "0.1.91"
 dependencies = [
 "chrono",
 "serde",
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.87"
+version = "0.1.91"
 edition = "2021"

 [dependencies]
--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.87"
+version = "0.1.91"
 edition = "2021"

 [dependencies]
--- a/dashboard/src/config/mod.rs
+++ b/dashboard/src/config/mod.rs
@@ -55,8 +55,8 @@ pub struct SystemConfig {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct SshConfig {
    pub rebuild_user: String,
-    pub rebuild_alias: String,
-    pub backup_alias: String,
+    pub rebuild_cmd: String,
+    pub service_manage_cmd: String,
 }

 /// Service log file configuration per host
--- a/dashboard/src/ui/mod.rs
+++ b/dashboard/src/ui/mod.rs
@@ -220,12 +220,12 @@ impl TuiApp {
                        let connection_ip = self.get_connection_ip(&hostname);
                        // Create command that shows logo, rebuilds, and waits for user input
                        let logo_and_rebuild = format!(
-                            "echo 'Rebuilding system: {} ({})' && ssh -tt {}@{} \"bash -ic {}\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Rebuilding system: {} ({})' && ssh -tt {}@{} \"bash -ic '{}'\"",
                            hostname,
                            connection_ip,
                            self.config.ssh.rebuild_user,
                            connection_ip,
-                            self.config.ssh.rebuild_alias
+                            self.config.ssh.rebuild_cmd
                        );
                        
                        std::process::Command::new("tmux")
@@ -244,12 +244,12 @@ impl TuiApp {
                        let connection_ip = self.get_connection_ip(&hostname);
                        // Create command that shows logo, runs backup, and waits for user input
                        let logo_and_backup = format!(
-                            "echo 'Running backup: {} ({})' && ssh -tt {}@{} \"bash -ic {}\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Running backup: {} ({})' && ssh -tt {}@{} \"bash -ic '{}'\"",
                            hostname,
                            connection_ip,
                            self.config.ssh.rebuild_user,
                            connection_ip,
-                            self.config.ssh.backup_alias
+                            format!("{} start borgbackup", self.config.ssh.service_manage_cmd)
                        );
                        
                        std::process::Command::new("tmux")
@@ -267,14 +267,12 @@ impl TuiApp {
                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                        let connection_ip = self.get_connection_ip(&hostname);
                        let service_start_command = format!(
-                            "echo 'Starting service: {} on {}' && ssh -tt {}@{} \"sudo systemctl start {} & sudo journalctl -fu {} --since=\\\"1 second ago\\\" --no-pager & while ! systemctl is-active {} >/dev/null 2>&1; do sleep 0.5; done; sudo pkill -f 'journalctl -fu {}' 2>/dev/null || true\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Starting service: {} on {}' && ssh -tt {}@{} \"bash -ic '{} start {}'\"",
                            service_name,
                            hostname,
                            self.config.ssh.rebuild_user,
                            connection_ip,
-                            service_name,
-                            service_name,
-                            service_name,
+                            self.config.ssh.service_manage_cmd,
                            service_name
                        );
                        
@@ -293,14 +291,12 @@ impl TuiApp {
                    if let (Some(service_name), Some(hostname)) = (self.get_selected_service(), self.current_host.clone()) {
                        let connection_ip = self.get_connection_ip(&hostname);
                        let service_stop_command = format!(
-                            "echo 'Stopping service: {} on {}' && ssh -tt {}@{} \"sudo systemctl stop {} & sudo journalctl -fu {} --since=\\\"1 second ago\\\" --no-pager & sleep 1; while systemctl is-active {} >/dev/null 2>&1; do sleep 0.5; done; sleep 2; sudo pkill -f 'journalctl -fu {}' 2>/dev/null || true\" && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Stopping service: {} on {}' && ssh -tt {}@{} \"bash -ic '{} stop {}'\"",
                            service_name,
                            hostname,
                            self.config.ssh.rebuild_user,
                            connection_ip,
-                            service_name,
-                            service_name,
-                            service_name,
+                            self.config.ssh.service_manage_cmd,
                            service_name
                        );
                        
@@ -397,7 +393,7 @@ impl TuiApp {
                    if let Some(hostname) = self.current_host.clone() {
                        let connection_ip = self.get_connection_ip(&hostname);
                        let ssh_command = format!(
-                            "echo 'Opening SSH terminal to: {}' && ssh -tt {}@{} && echo 'Press any key to close...' && read -n 1 -s",
+                            "echo 'Opening SSH terminal to: {}' && ssh -tt {}@{}",
                            hostname,
                            self.config.ssh.rebuild_user,
                            connection_ip
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.87"
+version = "0.1.91"
 edition = "2021"

 [dependencies]
Author	SHA1	Message	Date
Christoffer Martinsson	7bf9ca6201	Fix SSH command quoting and remove duplicate user prompts All checks were successful Build and Release / build-and-release (push) Successful in 2m8s Details - Fix rebuild and backup commands with proper inner command quoting - Remove duplicate "Press any key to close..." from SSH commands since scripts handle it - Clean up SSH terminal command to avoid redundant prompts - Ensure consistent command execution patterns across all SSH operations - Update version to 0.1.91	2025-11-19 16:08:03 +01:00
Christoffer Martinsson	f587b42797	Implement unified SSH command management with dedicated scripts All checks were successful Build and Release / build-and-release (push) Successful in 1m11s Details - Replace complex SSH command patterns with simple script calls - Create service-manage script for start/stop operations with proper logging - Create rebuild script equivalent to rebuild_git alias with user feedback - Update dashboard to use unified command pattern: sudo service-manage, sudo rebuild - Simplify backup to use service management: service-manage start borgbackup - Configure sudoers with wildcards for Nix store path compatibility - Remove cmtec references from script names for better genericity - Update version to 0.1.90	2025-11-19 15:37:33 +01:00
Christoffer Martinsson	7ae464e172	Wrap service commands in bash -c to ensure session persistence All checks were successful Build and Release / build-and-release (push) Successful in 1m10s Details - Use bash -c to properly execute service start/stop command sequences - Ensure SSH session stays alive for user input prompt - Fix escaping issues with nested quotes in commands - Update version to 0.1.89	2025-11-19 13:32:04 +01:00
Christoffer Martinsson	980c9a20a2	Fix service start/stop popup auto-close issue All checks were successful Build and Release / build-and-release (push) Successful in 1m12s Details - Move 'Press any key to close...' prompt inside SSH session - Ensure tmux popup stays open until user manually closes - Maintain consistent behavior with other SSH commands - Update version to 0.1.88	2025-11-19 13:21:48 +01:00