diff --git a/bin/omakub-sub/font-size.sh b/bin/omakub-sub/font-size.sh index 83a702e14..cb73617cb 100644 --- a/bin/omakub-sub/font-size.sh +++ b/bin/omakub-sub/font-size.sh @@ -1,8 +1,10 @@ -choice=$(gum choose {7..14} "<< Back" --height 11 --header "Choose your terminal font size") +FONT_SIZE_PATH="$HOME/.config/alacritty/font-size.toml" +choice=$(sed -n "s/^size = \(.*\)$/\1/p" $FONT_SIZE_PATH) -if [[ $choice =~ ^[0-9]+$ ]]; then - sed -i "s/^size = .*$/size = $choice/g" ~/.config/alacritty/font-size.toml - source $OMAKUB_PATH/bin/omakub-sub/font-size.sh -else - source $OMAKUB_PATH/bin/omakub-sub/font.sh -fi +# loop while various font sizes are selected; focus on current font size +while [[ $choice =~ ^[0-9]+$ ]]; do + sed -i "s/^size = .*$/size = $choice/g" $FONT_SIZE_PATH + choice=$(gum choose --selected "$choice" {7..14} "<< Back" --height 11 --header "Choose your terminal font size") +done + +source $OMAKUB_PATH/bin/omakub-sub/font.sh diff --git a/bin/omakub-sub/uninstall.sh b/bin/omakub-sub/uninstall.sh index 357449351..cd96dfa36 100644 --- a/bin/omakub-sub/uninstall.sh +++ b/bin/omakub-sub/uninstall.sh @@ -1,4 +1,9 @@ -UNINSTALLER=$(gum file $OMAKUB_PATH/uninstall --height 26) -[ -n "$UNINSTALLER" ] && gum confirm "Run uninstaller?" && source $UNINSTALLER && gum spin --spinner globe --title "Uninstall completed!" -- sleep 3 +CHOICES=($(find $OMAKUB_PATH/uninstall -type f -exec basename {} \; | sed 's/app-//;s/\.sh$//' | sort)) +CHOICES+=("<< Back") + +choice=$(gum choose "${CHOICES[@]}" --height 29 --header "Uninstall application") +app_user_wishes_to_uninstall=$(find $OMAKUB_PATH/uninstall -type f -name *"$choice".sh) + +[ -n "$app_user_wishes_to_uninstall" ] && gum confirm "Run uninstaller for $choice?" && source $app_user_wishes_to_uninstall && gum spin --spinner globe --title "Uninstall completed!" -- sleep 3 clear source $OMAKUB_PATH/bin/omakub