fixed not being able to copy URL with a dash in it
This commit is contained in:
parent
8ab3d03681
commit
7a7c5f8bfd
10
config.h
10
config.h
@ -234,11 +234,13 @@ MouseKey mkeys[] = {
|
|||||||
{ Button5, TERMMOD, zoom, {.f = -1} },
|
{ Button5, TERMMOD, zoom, {.f = -1} },
|
||||||
};
|
};
|
||||||
|
|
||||||
static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler", "externalpipe", NULL };
|
static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL };
|
||||||
|
|
||||||
static char *copyurlcmd[] = { "/bin/sh", "-c",
|
static char *copyurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -c", "externalpipe", NULL };
|
||||||
"tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard",
|
|
||||||
"externalpipe", NULL };
|
/* static char *copyurlcmd[] = { "/bin/sh", "-c", */
|
||||||
|
/* "tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", */
|
||||||
|
/* "externalpipe", NULL }; */
|
||||||
|
|
||||||
static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL };
|
static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL };
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
urlregex="(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)"
|
geturl() {
|
||||||
|
|
||||||
# First remove linebreaks and mutt sidebars:
|
# First remove linebreaks and mutt sidebars:
|
||||||
urls="$(sed 's/.*│//g' | tr -d '\n' |
|
urls="$(sed 's/.*│//g' | tr -d '\n' |
|
||||||
grep -aEo "$urlregex" | # grep only urls as defined above.
|
grep -aEo "$urlregex" | # grep only urls as defined above.
|
||||||
@ -9,7 +8,24 @@ urls="$(sed 's/.*│//g' | tr -d '\n' |
|
|||||||
sed 's/^www./http:\/\/www\./g')"
|
sed 's/^www./http:\/\/www\./g')"
|
||||||
|
|
||||||
[ -z "$urls" ] && exit
|
[ -z "$urls" ] && exit
|
||||||
|
}
|
||||||
|
|
||||||
chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)"
|
openurl() {
|
||||||
|
urlregex="(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)"
|
||||||
|
geturl
|
||||||
|
chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)"
|
||||||
|
setsid xdg-open "$chosen" >/dev/null 2>&1 &
|
||||||
|
}
|
||||||
|
|
||||||
setsid xdg-open "$chosen" >/dev/null 2>&1 &
|
copyurl() {
|
||||||
|
urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)"
|
||||||
|
geturl
|
||||||
|
echo $urls | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard
|
||||||
|
}
|
||||||
|
|
||||||
|
while getopts "hoc" o; do case "${o}" in
|
||||||
|
h) printf "Optional arguments for custom use:\\n -c: copy\\n -o: xdg-open\\n -h: Show this message\\n" && exit 1 ;;
|
||||||
|
o) openurl ;;
|
||||||
|
c) copyurl ;;
|
||||||
|
*) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;;
|
||||||
|
esac done
|
||||||
|
Loading…
Reference in New Issue
Block a user