From e43385e2cd39e7f31d594b348228d62b41515a68 Mon Sep 17 00:00:00 2001 From: epoch Date: Sun, 14 Nov 2021 04:24:51 +0000 Subject: choose has a default prompt if it is missing of $0. copy_start_nevermind.sh now uses -a from geturiline instead of assuming the first option --- choose | 7 ++++++- copy_start_nevermind.sh | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/choose b/choose index 1ec7dd7..816243c 100755 --- a/choose +++ b/choose @@ -6,10 +6,15 @@ #message=$1 #shift #sed 's|,|\\,|g;s|:|\\:|g' | tr '\n' ',' | rev | cut -b2- | rev | tr '\n' '\0' | xargs -0 xmessage -nearmouse "$@" "$message" -print -buttons +if [ "$1" ];then + prompt="$1" +else + prompt="< $0 >" +fi if [ $DISPLAY ];then #usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor] # [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid] - dmenu -l 10 -p "$1" -nb '#000000' -nf '#00aa00' -sb '#006600' -sf '#00ff00' + dmenu -l 10 -p "$prompt" -nb '#000000' -nf '#00aa00' -sb '#006600' -sf '#00ff00' else printf "%s" "$1" fi diff --git a/copy_start_nevermind.sh b/copy_start_nevermind.sh index 66bf922..08aa903 100755 --- a/copy_start_nevermind.sh +++ b/copy_start_nevermind.sh @@ -16,7 +16,13 @@ else fi scheme="$(uricut -s <<< "$uri")" -selection="$(printf "start with: %s\nremote_csn\ncopy\nshorten\nunshorten\ntitle\nverbose\nforget\nQR\n%s\n" "$(urigetline "$uri")" "$(printf "%s\n" "$uri" | uricut | grep -v '^whole')" \ + +with="$(urigetline "$uri" < ~/.config/uristart.conf)" +if [ "$with" != "$(urigetline -a "$uri" < ~/.config/uristart.conf)" ];then + with="[multiple matches]" +fi + +selection="$(printf "start with: %s\nremote_csn\ncopy\nshorten\nunshorten\ntitle\nverbose\nforget\nQR\n%s\n" "${with}" "$(printf "%s\n" "$uri" | uricut | grep -v '^whole')" \ | choose "${prompt}")" # | choose "$(printf "uri: '%s'\nwill be ran with: %s\n" "$uri" "$(urigetline "$uri")" )" -default start )" echo "$selection" -- cgit v1.2.3