From 87dc5549dc23edb7d1778ef4fc07ee10fee1b333 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 3 Jun 2024 15:32:02 -0700 Subject: [PATCH] Make commands more resilient --- bin/omakub | 11 +++++++++-- bin/omakub-font | 2 ++ bin/omakub-help | 4 ++-- bin/omakub-install | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/bin/omakub b/bin/omakub index ef482a9..b43babf 100755 --- a/bin/omakub +++ b/bin/omakub @@ -1,5 +1,12 @@ #!/bin/bash source $OMAKUB_PATH/ascii.sh -SUB=$(gum choose "Help" "Theme" "Font" "Install" | tr '[:upper:]' '[:lower:]') -source $OMAKUB_PATH/bin/omakub-$SUB + +if [ $# -eq 0 ]; then + SUB=$(gum choose "Help" "Theme" "Font" "Install" --height 7 --header "" | tr '[:upper:]' '[:lower:]') +else + SUB=$1 +fi + + +[ -n "$SUB" ] && source $OMAKUB_PATH/bin/omakub-$SUB diff --git a/bin/omakub-font b/bin/omakub-font index f6561cf..7e3258d 100644 --- a/bin/omakub-font +++ b/bin/omakub-font @@ -4,6 +4,8 @@ set -e # Pick a preconfigured theme FONT=$(gum choose "Cascadia Mono" "Fira Mono" "JetBrains Mono" "Meslo" | tr '[:upper:]' '[:lower:]' | sed 's/ /-/g') +[ ! -n "$FONT" ] && exit 0 + if [ "$FONT" == "cascadia-mono" ]; then NERD_FONT="CaskaydiaMono Nerd Font" elif [ "$FONT" == "fira-mono" ]; then diff --git a/bin/omakub-help b/bin/omakub-help index 51b1c07..9c55488 100644 --- a/bin/omakub-help +++ b/bin/omakub-help @@ -1,4 +1,4 @@ #!/bin/bash -HELP=$(gum choose "Hotkeys" "Commands" "Tactile" | tr '[:upper:]' '[:lower:]') -gum pager <$OMAKUB_PATH/help/$HELP.md +HELP=$(gum choose "Hotkeys" "Commands" "Tactile" --height 5 | tr '[:upper:]' '[:lower:]') +[ -n "$HELP" ] && gum pager <$OMAKUB_PATH/help/$HELP.md diff --git a/bin/omakub-install b/bin/omakub-install index b539cd3..c162fc5 100644 --- a/bin/omakub-install +++ b/bin/omakub-install @@ -1,4 +1,4 @@ #!/bin/bash INSTALLER=$(gum file $OMAKUB_PATH/install) -gum confirm "Run installer?" && source $INSTALLER +[ -n "$INSTALLER" ] && gum confirm "Run installer?" && source $INSTALLER