From b332337aa718cd13d6a9537f7abbee01031ba18f Mon Sep 17 00:00:00 2001 From: Jannis Baum Date: Thu, 26 Oct 2023 15:32:28 +0200 Subject: [PATCH] feat(#16): configure port, timeout & open command --- viv | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/viv b/viv index 4f518cb9..f4fb7b84 100755 --- a/viv +++ b/viv @@ -16,12 +16,23 @@ if ! [ -f "$1" ]; then fi FILE=`realpath "$1"` +if which jq 1>/dev/null 2>/dev/null; then + test -f ~/.vivify.json && VIV_CONFIG=~/.vivify.json + test -f ~/.vivify/config.json && VIV_CONFIG=~/.vivify/config.json + + if [ -n "$VIV_CONFIG" ]; then + [ -z "$VIV_PORT" ] && export VIV_PORT="`jq -r '.port' "$VIV_CONFIG" | sed 's/^null$//'`" + [ -z "$VIV_TIMEOUT" ] && export VIV_TIMEOUT="`jq -r '.timeout' "$VIV_CONFIG" | sed 's/^null$//'`" + [ -z "$VIV_OPEN" ] && export VIV_OPEN="`jq -r '.openCmd' "$VIV_CONFIG" | sed 's/^null$//'`" + fi +fi + if [ -z "$VIV_OPEN" ]; then which open 1>/dev/null 2>/dev/null && VIV_OPEN="open" which xdg-open 1>/dev/null 2>/dev/null && VIV_OPEN="xdg-open" if [ -z "$VIV_OPEN" ]; then - echo 'Please specify an "open" command in $VIV_OPEN' + echo 'Please specify an "open" command in ~/.vivify/config.json, ~/.vivify.json, or $VIV_OPEN' exit 1 fi fi