Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/ui/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,11 @@ impl DockerManager {
let rb_c = rb_toggle.clone();
let c_str = cmd_str.clone();
glib::MainContext::default().spawn_local(async move {
let cmd = format!("DOCKER_BIN=$(if [ -w /var/run/docker.sock ]; then echo 'docker'; else echo 'sudo -n docker'; fi); $DOCKER_BIN {} {}", c_str, n_c);
let safe_name = n_c.replace('\'', "'\\''");
let cmd = format!("DOCKER_BIN=$(if [ -w /var/run/docker.sock ]; then echo 'docker'; else echo 'sudo -n docker'; fi); $DOCKER_BIN {} '{}'", c_str, safe_name);
let _ = run_remote_command(&h_c, p_c.as_deref(), &cmd).await;
rb_c.emit_clicked();
});
});
}); });
actions.append(&toggle_btn);
}

Expand All @@ -313,10 +313,11 @@ impl DockerManager {
let rb_c = rb_del.clone();
glib::MainContext::default().spawn_local(async move {
let sub_cmd = if is_c_del { "rm -f" } else { "rmi" };
let cmd = format!("DOCKER_BIN=$(if [ -w /var/run/docker.sock ]; then echo 'docker'; else echo 'sudo -n docker'; fi); $DOCKER_BIN {} {}", sub_cmd, n_c);
let _ = run_remote_command(&h_c, p_c.as_deref(), &cmd).await; rb_c.emit_clicked();
});
});
let safe_name = n_c.replace('\'', "'\\''");
let cmd = format!("DOCKER_BIN=$(if [ -w /var/run/docker.sock ]; then echo 'docker'; else echo 'sudo -n docker'; fi); $DOCKER_BIN {} '{}'", sub_cmd, safe_name);
let _ = run_remote_command(&h_c, p_c.as_deref(), &cmd).await;
rb_c.emit_clicked();
}); });

actions.append(&delete_btn);
row.append(&actions);
Expand Down