From 3e559a8ecad2c03880c1105a729b69faaa2eb362 Mon Sep 17 00:00:00 2001 From: KatolaZ Date: Wed, 8 Jan 2020 19:56:11 +0000 Subject: improve presentation in searcg_cgi --- search_cgi | 12 ++++++++---- search_repo | 6 ++++++ 2 files changed, 14 insertions(+), 4 deletions(-) mode change 100644 => 100755 search_cgi diff --git a/search_cgi b/search_cgi old mode 100644 new mode 100755 index 624ad2e..425ce55 --- a/search_cgi +++ b/search_cgi @@ -4,8 +4,10 @@ echo "Content-type: text/html\n\n" query="${QUERY_STRING}" - -echo "

Search for:

" @@ -17,15 +19,17 @@ terms=$(echo "${query}" | tr '&' '\n' | grep -E "^query" | sed -E 's/^query=//') if [ -z "$terms" ]; then exit 0 else - search=$(echo "$terms" | sed -E 's/\%20/ /g') + search=$(echo "$terms" | sed -E 's/\+/ /g') res=$(./search_repo ./ $search ) if [ -z "$res" ]; then echo "

No results for \"$search\":" exit 0; else echo "

Results for \"$search\"" + echo "

" fi fi diff --git a/search_repo b/search_repo index 65dd9c5..0f4f42c 100755 --- a/search_repo +++ b/search_repo @@ -15,10 +15,16 @@ shift WORDS="$@" query=$(echo "$WORDS" | sed -E 's/\ /\|/g') +echo "$query" cd "$FOLDER" +repos=$(find ./ -type d | grep -E "\/.*\/" | grep -Ei "$query" | \ + sed -E 's/.\/([a-z]+)\//\1:\/\//1') + res=$(grep -Eric "$query" | grep -v ":0$" | sort -t ':' -rnk2 | \ sed -E 's/([a-z]+)\//\1:\/\//1;s/\/[^\/]*$//' ) +echo "$repos" | grep -Ei "^[a-z]+://" +echo "--" >&2 echo "$res" | grep -Ei "^[a-z]+://" -- cgit v1.2.3