differentiate between -s/-t for new sessions on older clients

[etc/tmux.git] / .bin / tmux

diff --git a/.bin/tmux b/.bin/tmux
index 30d301717cd0797158a1166b44563828ff22427e..93837e017c0fc8661b9be6eff30c736ce29c1b78 100755 (executable)
--- a/.bin/tmux
+++ b/.bin/tmux
@@ -13,7 +13,9 @@ real_tmux() {
 
 single_tmux_session() {
   local id; id="$1"; shift
-  real_tmux new -t "$id" "$@"
+  local flag; flag=t
+  real_tmux list-sessions | grep -q "^${id}:" || flag=s
+  real_tmux new -$flag "$id" "$@"
 }
 
 tmux_session_exists() {
@@ -34,15 +36,26 @@ if [ "${1:-}" = last ]; then
     echo >&2 W: No tmux session ID stored, generating a new one…
   fi
 
-elif [ -n "${1:-}" ]; then
-  real_tmux "$@"
+else
+  case "${1:-;}" in
+    (\;) :;;
+    (*) real_tmux "$@";;
+  esac
 fi
 
 # only without argument create a new session with a random name/id to which we
 # can then attach
 
-if ! command -v uuidgen >/dev/null; then
+hascmd() { command -v "$@" >/dev/null;}
+
+if   hascmd uuid; then alias uuidgen=uuid
+elif hascmd uuidgen; then :
+elif hascmd python3; then
   uuidgen() { python3 -c 'import uuid; print(uuid.uuid1())'; }
+elif hascmd python; then
+  uuidgen() { python -c 'import uuid; print(uuid.uuid1())'; }
+else
+  uuidgen() { dd if=/dev/urandom bs=16 count=1 status=none | base64; }
 fi
 UUID=$(uuidgen)
 echo "$UUID" > $LASTSESSIONIDFILE