From: martin f. krafft Date: Fri, 27 Mar 2020 19:08:08 +0000 (+1300) Subject: do not conflict with which command X-Git-Url: https://git.madduck.net/etc/tmux.git/commitdiff_plain/941f9fb60367daa10020590112a49a6bc93c7be5?ds=sidebyside do not conflict with which command --- diff --git a/.bin/tmux b/.bin/tmux index 577b746..38243a3 100755 --- 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 -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())'; } -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; }