From 793b4f231ab0f1010083cc350276380f599423b0 Mon Sep 17 00:00:00 2001 From: David Personette Date: Sun, 14 Jul 2019 17:21:12 -0400 Subject: [PATCH] samba.sh fix #219 hopefully the last bug with the new multi-variable handling --- samba.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/samba.sh b/samba.sh index 745be71..0b59239 100755 --- a/samba.sh +++ b/samba.sh @@ -242,17 +242,17 @@ shift $(( OPTIND - 1 )) [[ "${CHARMAP:-""}" ]] && charmap "$CHARMAP" while read i; do global "$i" -done < <(env | awk '/^GLOBAL/ {sub (/^[^=]*=/, "", $0); print}') +done < <(env | awk '/^GLOBAL[0-9=_]/ {sub (/^[^=]*=/, "", $0); print}') [[ "${IMPORT:-""}" ]] && import "$IMPORT" [[ "${PERMISSIONS:-""}" ]] && perms [[ "${RECYCLE:-""}" ]] && recycle while read i; do eval share $(sed 's/^/"/; s/$/"/; s/;/" "/g' <<< $i) -done < <(env | awk '/^SHARE/ {sub (/^[^=]*=/, "", $0); print}') +done < <(env | awk '/^SHARE[0-9=_]/ {sub (/^[^=]*=/, "", $0); print}') [[ "${SMB:-""}" ]] && smb while read i; do eval user $(sed 's/^/"/; s/$/"/; s/;/" "/g' <<< $i) -done < <(env | awk '/^USER/ {sub (/^[^=]*=/, "", $0); print}') +done < <(env | awk '/^USER[0-9=_]/ {sub (/^[^=]*=/, "", $0); print}') [[ "${WORKGROUP:-""}" ]] && workgroup "$WORKGROUP" [[ "${WIDELINKS:-""}" ]] && widelinks [[ "${INCLUDE:-""}" ]] && include "$INCLUDE"