repo: uritools
action: commit
revision: 
path_from: 
revision_from: e43385e2cd39e7f31d594b348228d62b41515a68:
path_to: 
revision_to: 
git.thebackupbox.net
uritools
git clone git://git.thebackupbox.net/uritools
commit e43385e2cd39e7f31d594b348228d62b41515a68
Author: epoch 
Date:   Sun Nov 14 04:24:51 2021 +0000

    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

diff --git a/choose b/choose
index 1ec7dd7df925d4e780d9bda2dd769c3736d7bdfd..
index ..816243c41472cbe5760157cbcf592b8f1e4d4fb3 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 66bf9224a9319c772076949b677f0157c1d6748e..
index ..08aa903612cb5bb543134ac7866698974218c148 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"

-----END OF PAGE-----