diff --git a/Documents/bin/wb b/Documents/bin/wb index d2020f32fdf246d2975113940e20d429cfc594ad..59b1357b2ac034a106ffdd5b55c3fb0a5c500ff9 100755 --- a/Documents/bin/wb +++ b/Documents/bin/wb @@ -33,7 +33,7 @@ _kill() { } list() { - if in_toolbox + if in_toolbox && is_tmux_running then tmux -L "$TMUX_SOCKET" list-sessions | awk -F: '{print $1}' elif container_exists @@ -43,7 +43,7 @@ list() { fi } -image_exitst() { +image_exists() { podman image exists "$IMAGE" } @@ -60,11 +60,15 @@ is_latest() { current="$(podman container inspect "$CONTAINER" --format '{{ .Image }}')" podman image pull "$IMAGE" > /dev/null new="$(podman image inspect "$IMAGE" --format '{{.Digest}}')" - [ "$new" = "$current" ] || return 1 + [ "$new" = "$current" ] +} + +is_tmux_running() { + [ -S "/tmp/tmux-$(id -u)/$TMUX_SOCKET" ] && pgrep tmux >/dev/null } kill_tmux() { - if [ -S "/tmp/tmux-$(id -u)/$TMUX_SOCKET" ] && pgrep tmux >/dev/null + if is_tmux_running then toolbox run --container "$CONTAINER" -- \ tmux -L "$TMUX_SOCKET" kill-server