Handle IFS in a sh-compatible way

On sh shell like dash, IFS cannot be local var. Also when setting IFS with the "IFS=$' ';" syntax $ character is also added to the IFS value.
cea-hpc · Nov 11, 2017 · 7a36a42 · 7a36a42
1 parent c7c793c
commit 7a36a42
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/init/bash.in b/init/bash.in
@@ -3,7 +3,7 @@ _mlre='';
 if [ -n "${IFS+x}" ]; then
    _mlIFS=$IFS;
 fi;
-IFS=$' ';
+IFS=' ';
 for _mlv in ${MODULES_RUN_QUARANTINE}; do
    if [ "${_mlv}" = "${_mlv##*[!A-Za-z0-9_]}" -a "${_mlv}" = "${_mlv#[0-9]}" ]; then
       if [ -n "`eval 'echo ${'$_mlv'+x}'`" ]; then

diff --git a/init/ksh.in b/init/ksh.in
@@ -3,7 +3,7 @@ _mlre='';
 if [ -n "${IFS+x}" ]; then
    _mlIFS=$IFS;
 fi;
-IFS=$' ';
+IFS=' ';
 for _mlv in ${MODULES_RUN_QUARANTINE}; do
    if [ "${_mlv}" = "${_mlv##*[!A-Za-z0-9_]}" -a "${_mlv}" = "${_mlv#[0-9]}" ]; then
       if [ -n "`eval 'echo ${'$_mlv'+x}'`" ]; then

diff --git a/init/sh.in b/init/sh.in
@@ -3,7 +3,7 @@ _mlre='';
 if [ -n "${IFS+x}" ]; then
    _mlIFS=$IFS;
 fi;
-IFS=$' ';
+IFS=' ';
 for _mlv in ${MODULES_RUN_QUARANTINE}; do
    if [ "${_mlv}" = "${_mlv##*[!A-Za-z0-9_]}" -a "${_mlv}" = "${_mlv#[0-9]}" ]; then
       if [ -n "`eval 'echo ${'$_mlv'+x}'`" ]; then

diff --git a/init/zsh.in b/init/zsh.in
@@ -3,7 +3,7 @@ _mlre='';
 if [ -n "${IFS+x}" ]; then
    _mlIFS=$IFS;
 fi;
-IFS=$' ';
+IFS=' ';
 for _mlv in ${=MODULES_RUN_QUARANTINE}; do
    if [ "${_mlv}" = "${_mlv##*[!A-Za-z0-9_]}" -a "${_mlv}" = "${_mlv#[0-9]}" ]; then
       if [ -n "`eval 'echo ${'$_mlv'+x}'`" ]; then

diff --git a/modulecmd.tcl.in b/modulecmd.tcl.in
@@ -2594,7 +2594,7 @@ if ( ! \$?histchars && ! \$?prompt ) alias module '$eval_cmd' ;"
    if \[ -n \"\${IFS+x}\" \]; then
       $locf _mlIFS=\$IFS;
    fi;
-   $locf IFS=\$' ';
+   IFS=' ';
    for _mlv in \${${wsplit}MODULES_RUN_QUARANTINE}; do"
             append fdef {
       if [ "${_mlv}" = "${_mlv##*[!A-Za-z0-9_]}" -a "${_mlv}" = "${_mlv#[0-9]}" ]; then

diff --git a/testsuite/modules.70-maint/120-autoinit.exp b/testsuite/modules.70-maint/120-autoinit.exp
@@ -88,21 +88,21 @@ set func_quar_sh "\\s*local _mlre=''; local _mlv; local _mlrv;
 \\s*if \\\[ -n \"\\\${IFS\\\+x}\" \\\]; then
 \\s*local _mlIFS=\\\$IFS;
 \\s*fi;
-\\s*local IFS=\\\$' ';
+\\s*IFS=' ';
 \\s*for _mlv in \\\${MODULES_RUN_QUARANTINE}; do
 $end_quar_sh"
 set func_quar_zsh "\\s*typeset _mlre=''; typeset _mlv; typeset _mlrv;
 \\s*if \\\[ -n \"\\\${IFS\\\+x}\" \\\]; then
 \\s*typeset _mlIFS=\\\$IFS;
 \\s*fi;
-\\s*typeset IFS=\\\$' ';
+\\s*IFS=' ';
 \\s*for _mlv in \\\${=MODULES_RUN_QUARANTINE}; do
 $end_quar_sh"
 set func_quar_sh_other "\\s*typeset _mlre=''; typeset _mlv; typeset _mlrv;
 \\s*if \\\[ -n \"\\\${IFS\\\+x}\" \\\]; then
 \\s*typeset _mlIFS=\\\$IFS;
 \\s*fi;
-\\s*typeset IFS=\\\$' ';
+\\s*IFS=' ';
 \\s*for _mlv in \\\${MODULES_RUN_QUARANTINE}; do
 $end_quar_sh"
 set func_clean_ifs "\\s*if \\\[ -n \"\\\${_mlIFS\\\+x}\" \\\]; then