diff --git a/install-wizard.sh b/install-wizard.sh index 4bf0491..fbb4a02 100644 --- a/install-wizard.sh +++ b/install-wizard.sh @@ -20,7 +20,7 @@ fi function binary_or_brew_label() { if [[ "$PLATFORM" == "Darwin" ]]; then - echo "Install from source" + echo "Install with brew" else echo "Download binary" fi @@ -28,9 +28,9 @@ function binary_or_brew_label() { function binary_or_brew_action() { if [[ "$PLATFORM" == "Darwin" ]]; then - echo "download-binary" - else echo "install-with-brew" + else + echo "download-binary" fi } @@ -42,7 +42,9 @@ tmux display-menu -T "tmux-fingers" \ "- It looks like it is the first time you are running the plugin. We need the binary first for things to work. " "" "" \ "- " "" ""\ "" \ - "$(binary_or_brew_label)" b "display-popup 'bash $CURRENT_DIR/$0 $(binary_or_brew_label)" \ - "Build from source" s "display-popup 'bash $CURRENT_DIR/$0 install-from-source'" \ + "$(binary_or_brew_label)" b "popup \"bash $CURRENT_DIR/install-wizard.sh $(binary_or_brew_action)\"" \ + "Build from source" s "popup \"bash $CURRENT_DIR/install-wizard.sh install-from-source\"" \ "" \ "Exit" q "" + +exit 0 diff --git a/tmux-fingers.tmux b/tmux-fingers.tmux index eef5814..ff5901f 100755 --- a/tmux-fingers.tmux +++ b/tmux-fingers.tmux @@ -3,8 +3,7 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if [ ! -f "$CURRENT_DIR/bin/tmux-fingers" ]; then - echo "tmux-fingers not found. Please run ./install.sh" - exit 1 + bash $CURRENT_DIR/install-wizard.sh fi "$CURRENT_DIR/bin/tmux-fingers" "load-config"