From a302a198fd5414caa5c7ce438197200f7b37c66c Mon Sep 17 00:00:00 2001 From: Wenxuan Date: Sat, 14 Apr 2018 11:41:28 +0800 Subject: Improve extract regex --- fzf-url.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fzf-url.sh b/fzf-url.sh index 04a6060..4833d72 100755 --- a/fzf-url.sh +++ b/fzf-url.sh @@ -16,9 +16,9 @@ elif hash open &>/dev/null; then fi content="$(tmux capture-pane -J -p)" -urls=($(echo "$content" |grep -oE '\b(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]*[-A-Za-z0-9+&@#/%=~_|]')) -wwws=($(echo "$content" |grep -oE 'www(\.[^\.]+)+' | sed 's/\(.*\)/http:\/\/\1/')) -ips=($(echo "$content" |grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(:[0-9].*)?' | sed 's/\(.*\)/http:\/\/\1/')) +urls=($(echo "$content" |grep -oE '(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]*[-A-Za-z0-9+&@#/%=~_|]')) +wwws=($(echo "$content" |grep -oE '(([a-zA-Z](-?[a-zA-Z0-9])*)\.)*[a-zA-Z](-?[a-zA-Z0-9])+\.[a-zA-Z]{2,}(/\S+)*' |sed 's/^\(.*\)$/http:\/\/\1/')) +ips=($(echo "$content" |grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}(:[0-9]{1,5})?(/\S+)*' |sed 's/^\(.*\)$/http:\/\/\1/')) merge() { for item in "$@" ; do -- cgit v1.2.3