do not conflict with which command

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

diff --git a/.bin/tmux b/.bin/tmux
index 3fc4b4fd89181aabadc489b302738293e32acb8e..38243a3780940d49f7b5bb794234656922c95dba 100755 (executable)
--- a/.bin/tmux
+++ b/.bin/tmux
@@ -20,7 +20,7 @@ tmux_session_exists() {
   _tmux_eval_only=1 real_tmux has-session -t "$1"
 }
 
   _tmux_eval_only=1 real_tmux has-session -t "$1"
 }
 

-if [ "${1:-}" = --connect-to-last ]; then
+if [ "${1:-}" = last ]; then

   shift
   if [ -f "$LASTSESSIONIDFILE" ]; then
     UUID="$(cat $LASTSESSIONIDFILE)"
   shift
   if [ -f "$LASTSESSIONIDFILE" ]; then
     UUID="$(cat $LASTSESSIONIDFILE)"


@@ -34,15 +34,26 @@ if [ "${1:-}" = --connect-to-last ]; then
     echo >&2 W: No tmux session ID stored, generating a new one…
   fi
 
     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
 
 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())'; }
   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
 fi
 UUID=$(uuidgen)
 echo "$UUID" > $LASTSESSIONIDFILE