From d0a2439d11acdb52f2b226d0731cc2ffa6fae1b2 Mon Sep 17 00:00:00 2001 From: suchAdemon Date: Wed, 26 Jan 2022 13:56:07 +0100 Subject: [PATCH] gitea_get_notifications.sh: more reponamefilter regex fun --- gitea_get_notifications.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitea_get_notifications.sh b/gitea_get_notifications.sh index b020b3f..d025a52 100755 --- a/gitea_get_notifications.sh +++ b/gitea_get_notifications.sh @@ -20,7 +20,7 @@ if [ "${gettype}" == "merged" ]; then mark_read=false noti_id="$(grep -oE "^[0-9]+" <<<"${merged_noti}")" noti_pr_id="$(grep -oE '@@#[0-9]+@@' <<<"${merged_noti}" | sed -e 's/[@#]//g')" - noti_repo="$(grep -oE '@[a-z0-9]+/[a-z0-9]+$' <<<"${merged_noti}" | sed -e 's/@//g')" + noti_repo="$(grep -oE '@[a-z0-9_.-]+.[a-z0-9_.-]+$' <<<"${merged_noti}" | sed -e 's/@//g')" pr_info=$(tea pr ls --state all --repo "${noti_repo}" | grep -E "^\| +${noti_pr_id} .* closed ") if grep -qE " closed +\| +${myuser} +\|" <<<"${pr_info}"; then @@ -52,7 +52,7 @@ elif [ "${gettype}" == "open" ]; then for open_noti in ${open_notis}; do noti_id="$(grep -oE "^[0-9]+" <<<"${open_noti}")" noti_pr_id="$(grep -oE '@@#[0-9]+@@' <<<"${open_noti}" | sed -e 's/[@#]//g')" - noti_repo="$(grep -oE '@[a-z0-9_-]+.[a-z0-9_-]+$' <<<"${open_noti}" | sed -e 's/@//g')" + noti_repo="$(grep -oE '@[a-z0-9_.-]+.[a-z0-9_.-]+$' <<<"${open_noti}" | sed -e 's/@//g')" pr_info=$(tea pr ls --state all --repo "${noti_repo}" | grep -E "^\| +${noti_pr_id} .* open ") if grep -qE " open +\| +${myuser} +\|" <<<"${pr_info}"; then