From 30c99c11b97c29bcc2b8ed20af7a4cf0734c0b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig-=C3=98rjan=20Smelror?= Date: Sat, 10 Feb 2024 22:09:19 +0100 Subject: [PATCH] Refactor code in qsgen2 script This commit refactors the code in the qsgen2 script. It fixes the assignment of the variable by using the correct syntax for capturing the match in the regular expression. It also fixes the assignment of the variable in the function. These changes ensure that the script works correctly with both the native and markdown generators. --- qsgen2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qsgen2 b/qsgen2 index 80a8329..14172e7 100755 --- a/qsgen2 +++ b/qsgen2 @@ -511,7 +511,8 @@ function _pages() { if (${debug}) _msg debug "_pages: Finding page_title" if [[ ${generator} == "native" ]]; then # Use Zsh built in functions to find page_title - [[ "${page_content}" =~ ^#title=(.*) ]] && local page_title=$match[1] + [[ "${page_content}" =~ ^#title=(.*) ]]; then + local page_title=$match[1] #local page_title=$( echo ${page_content} | head -2 | grep \#title | cut -d= -f2 ) elif [[ ${generator} == "markdown" ]]; then while IFS= read -r line @@ -694,7 +695,8 @@ function _blogs() { # Array sdate = Name day=1, Year=2, Month=3, Number day=4 sdate=( $( echo ${content} | grep DATE | sed "s|DATE\ ||" | sed "s|\-|\ |g" ) ) if [[ ${generator} == "native" ]]; then - if [[ "${content}" =~ "^BLOG_TITLE (.*)$" ]] && btitle=$match[1] + if [[ "${content}" =~ "^BLOG_TITLE (.*)$" ]]; then + btitle=$match[1] #btitle=$( echo ${content} | grep BLOG_TITLE | cut -d' ' -f2- ) elif [[ ${generator} == "markdown" ]]; then while IFS= read -r line