From 09ae7046832c74d6cf801ad62fa1de0e634730d8 Mon Sep 17 00:00:00 2001
From: Kayou <pierre@kayou.io>
Date: Tue, 25 Jun 2024 15:47:49 +0200
Subject: [PATCH] fix regex in ynh_write_var_in_file/ynh_read_var_in_file

---
 helpers/helpers.v1.d/templating   | 4 ++--
 helpers/helpers.v2.1.d/templating | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helpers/helpers.v1.d/templating b/helpers/helpers.v1.d/templating
index 76f319137..f2c75e350 100644
--- a/helpers/helpers.v1.d/templating
+++ b/helpers/helpers.v1.d/templating
@@ -260,7 +260,7 @@ ynh_read_var_in_file() {
         comments="//"
     fi
     local list='\[\s*['$string']?\w+['$string']?\]'
-    local var_part='^\s*((const|var|let)\s+)?\$?(\w+('$list')*(->|\.|\[))*\s*'
+    local var_part='^\s*((const|var|let)\s+)?\$?(('$list')*(->|\.|\[))*\s*'
     var_part+="[$string]?${key}[$string]?"
     var_part+='\s*\]?\s*'
     var_part+="($assign)"
@@ -339,7 +339,7 @@ ynh_write_var_in_file() {
         comments="//"
     fi
     local list='\[\s*['$string']?\w+['$string']?\]'
-    local var_part='^\s*((const|var|let)\s+)?\$?(\w+('$list')*(->|\.|\[))*\s*'
+    local var_part='^\s*((const|var|let)\s+)?\$?(('$list')*(->|\.|\[))*\s*'
     var_part+="[$string]?${key}[$string]?"
     var_part+='\s*\]?\s*'
     var_part+="($assign)"
diff --git a/helpers/helpers.v2.1.d/templating b/helpers/helpers.v2.1.d/templating
index dc7a090a2..6b3986a61 100644
--- a/helpers/helpers.v2.1.d/templating
+++ b/helpers/helpers.v2.1.d/templating
@@ -209,7 +209,7 @@ ynh_read_var_in_file() {
         comments="//"
     fi
     local list='\[\s*['$string']?\w+['$string']?\]'
-    local var_part='^\s*((const|var|let)\s+)?\$?(\w+('$list')*(->|\.|\[))*\s*'
+    local var_part='^\s*((const|var|let)\s+)?\$?(('$list')*(->|\.|\[))*\s*'
     var_part+="[$string]?${key}[$string]?"
     var_part+='\s*\]?\s*'
     var_part+="($assign)"
@@ -285,7 +285,7 @@ ynh_write_var_in_file() {
         comments="//"
     fi
     local list='\[\s*['$string']?\w+['$string']?\]'
-    local var_part='^\s*((const|var|let)\s+)?\$?(\w+('$list')*(->|\.|\[))*\s*'
+    local var_part='^\s*((const|var|let)\s+)?\$?(('$list')*(->|\.|\[))*\s*'
     var_part+="[$string]?${key}[$string]?"
     var_part+='\s*\]?\s*'
     var_part+="($assign)"