From 0d48eca43e36cd7e1d1b03ab65058d314a2c3682 Mon Sep 17 00:00:00 2001 From: bob8677 <11bob8677@gmail.com> Date: Sat, 27 Mar 2021 13:18:03 -0500 Subject: [PATCH] search assists function --- cache.sh | 3 +++ instantassist | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/cache.sh b/cache.sh index ab7cc82..e276493 100755 --- a/cache.sh +++ b/cache.sh @@ -4,6 +4,7 @@ rm -rf cache mkdir cache +SEARCH="$(realpath .)/cache/search" HELP="$(realpath .)/cache/help" CACHE="$(realpath .)/cache/cache" CDIR="$(realpath .)/cache" @@ -26,12 +27,14 @@ for i in ./*; do SUBNAME=$(grep -o '[a-z]\.' <<<"$u" | grep -o '[a-z]') echo " $SUBNAME$(grep '# assist: ' "$u" | grep -o ':.*')" >>"$HELP" echo "$SUBNAME$(grep '# assist: ' "$u" | sed 's/^# assist: //g')" >>"$CDIR/$CATNAME/cache" + echo "$(grep '# assist: ' "$u" | sed 's/^# assist: //g') ($CATNAME$SUBNAME)" >> "$SEARCH" done echo "" >>"$HELP" cd .. || exit else SUBNAME=$(grep -o '[a-z]\.' <<<"$i" | grep -o '[a-z]') echo "$SUBNAME$(grep '# assist: ' "$i" | grep -o ':.*')" >>"$HELP" + echo "$(grep '# assist: ' "$i" | sed 's/^# assist: //g') ($SUBNAME)" >> "$SEARCH" fi done diff --git a/instantassist b/instantassist index 8513492..3d4bb76 100755 --- a/instantassist +++ b/instantassist @@ -2,10 +2,19 @@ # main menu to access instantASSIST -ASSIST=$(cat /usr/share/instantassist/cache/cache | instantmenu -i -p instantASSIST -F -ct | grep -o '^.') +ASSIST=$( (cat /usr/share/instantassist/cache/cache; echo /search assists) | instantmenu -i -p instantASSIST -F -ct | grep -o '^.') [ -z "$ASSIST" ] && exit +if [ "$ASSIST" = '/' ]; then + SCRIPTPATH="/usr/share/instantassist/assists/\ +$(cat /usr/share/instantassist/cache/search | +instantmenu -p 'assist:' -l 8 -i -g 3 -q 'search assists' -h -1 -r | +sed 's/^.*(//;s/)$//;s/.$/\/&/;s/^\///')" + echo $SCRIPTPATH + [ -e "$SCRIPTPATH" ] && exit +else + if [ -d /usr/share/instantassist/assists/"$ASSIST" ]; then ASSIST2="$(instantmenu -i -p instantASSIST -n -h 32 -F -ct