do not conflict with which command

diff --git a/.bin/tmux b/.bin/tmux
index 577b74606eef37acbc1d484011663bdda05e8e2b..38243a3780940d49f7b5bb794234656922c95dba 100755 (executable)
--- a/.bin/tmux
+++ b/.bin/tmux
@@ -44,13 +44,13 @@ fi
 # only without argument create a new session with a random name/id to which we
 # can then attach
 
 # only without argument create a new session with a random name/id to which we
 # can then attach
 

-which() { command -v "$@" >/dev/null;}
+hascmd() { command -v "$@" >/dev/null;}

 
 

-if   which uuid; then alias uuidgen=uuid
-elif which uuidgen; then :
-elif which python3; then
+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 which python; then
+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; }
   uuidgen() { python -c 'import uuid; print(uuid.uuid1())'; }
 else
   uuidgen() { dd if=/dev/urandom bs=16 count=1 status=none | base64; }