From 1e60f88ec43863e77fb191d20a18b578559a2507 Mon Sep 17 00:00:00 2001 From: Michael Housh Date: Wed, 19 Nov 2025 05:34:51 -0500 Subject: [PATCH] WIP: Adds --no-spin option to shorten-url, fixes dev-env to copy shorten-url utils scripts. --- dev-env | 3 ++- env/.local/scripts/shorten-url | 22 ++++++++++++++++++--- env/.local/scripts/utils/shorten-url/create | 4 ++-- env/.local/scripts/utils/shorten-url/env | 7 +++++++ 4 files changed, 30 insertions(+), 6 deletions(-) create mode 100755 env/.local/scripts/utils/shorten-url/env diff --git a/dev-env b/dev-env index 49f799f..c1fc02e 100755 --- a/dev-env +++ b/dev-env @@ -119,11 +119,12 @@ update_dirs $DEV_ENV/env/.local $HOME/.local # SCRIPTS mkdir -p ~/.local/scripts/{hypr,utils} >/dev/null 2>&1 -mkdir -p ~/.local/scripts/utils/{kanatactl,hpa} >/dev/null 2>&1 +mkdir -p ~/.local/scripts/utils/{kanatactl,hpa,shorten-url} >/dev/null 2>&1 update_dirs $DEV_ENV/env/.local/scripts/hypr $HOME/.local/scripts/hypr copy_files $DEV_ENV/env/.local/scripts/hypr $HOME/.local/scripts/hypr copy_files "$DEV_ENV/env/.local/scripts/utils/kanatactl" "$HOME/.local/scripts/utils/kanatactl" copy_files "$DEV_ENV/env/.local/scripts/utils/hpa" "$HOME/.local/scripts/utils/hpa" +copy_files "$DEV_ENV/env/.local/scripts/utils/shorten-url" "$HOME/.local/scripts/utils/shorten-url" copy_files $DEV_ENV/env/.local/scripts $HOME/.local/scripts # SYSTEMD diff --git a/env/.local/scripts/shorten-url b/env/.local/scripts/shorten-url index c75b0ee..d058d41 100755 --- a/env/.local/scripts/shorten-url +++ b/env/.local/scripts/shorten-url @@ -10,6 +10,9 @@ LOG_LABEL=$(basename "$THIS_FILE") THIS=${THIS:-$LOG_LABEL} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"} +declare -a args +no_spin_flag="0" + # Logging utility function, use in place of echo. log() { logging log --source "$THIS_FILE" "$@" @@ -23,7 +26,20 @@ log() { source "$SCRIPTS/hypr/logging" setup-logging "$LOG_FILE" "$LOG_LABEL" -script="$SCRIPTS/utils/shorten-url/create" -title="Generating short url..." +while [[ $# -gt 0 ]]; do + if [[ $1 == "--no-spin" ]]; then + no_spin_flag="1" + else + args+=("$1") + fi + shift +done -gum spin --show-output --title="$title" -- bash -c "$script $*" +script="$SCRIPTS/utils/shorten-url/create" + +if [[ $no_spin_flag == "1" ]]; then + bash -c "$script ${args[*]}" +else + title="Generating short url..." + gum spin --show-output --title="$title" -- bash -c "$script ${args[*]}" +fi diff --git a/env/.local/scripts/utils/shorten-url/create b/env/.local/scripts/utils/shorten-url/create index 74e2cbf..50efae6 100755 --- a/env/.local/scripts/utils/shorten-url/create +++ b/env/.local/scripts/utils/shorten-url/create @@ -10,8 +10,8 @@ LOG_LABEL=$(basename "$THIS_FILE") THIS=${THIS:-$LOG_LABEL} LOG_FILE=${LOG_FILE:-"$LOG_LABEL.log"} -API_KEY=$(/bin/gopass show --password Keys/shlink/api-key) -BASE_URL="https://l.housh.dev/rest/v3" +# Setup environment +source "$SCRIPTS/utils/shorten-url/env" declare url shortCode declare -a tags diff --git a/env/.local/scripts/utils/shorten-url/env b/env/.local/scripts/utils/shorten-url/env new file mode 100755 index 0000000..decaab4 --- /dev/null +++ b/env/.local/scripts/utils/shorten-url/env @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +API_KEY=$(/bin/gopass show --password Keys/shlink/api-key) +BASE_URL="https://l.housh.dev/rest/v3" + +export API_KEY +export BASE_URL