From cb3dbbecedcf1fed7ee4bf69a696da4af1df4aa5 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Wed, 24 Nov 2021 15:22:23 +0200
Subject: [PATCH] Small fixes to wb.
---
Documents/bin/wb | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documents/bin/wb b/Documents/bin/wb
index d2020f3..59b1357 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
--
GitLab