global: work around bash-3.0 bug that single quotas remains for "${v-…

…$''}"
akinomyoga · Jul 28, 2022 · fb607ad · fb607ad
1 parent 7da5f04
commit fb607ad
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/ble-core.sh b/ble-core.sh
@@ -566,7 +566,7 @@ else
     local _ble_local_ret=$?
     TMOUT= IFS= builtin read -r -d '' "$1" < "$_ble_local_tmpfile"
     ble/util/assign/.rmtmp
-    builtin eval "$1=\${$1%$'\n'}"
+    builtin eval "$1=\${$1%$_ble_term_nl}"
     return "$_ble_local_ret"
   }
 fi

diff --git a/lib/core-syntax.sh b/lib/core-syntax.sh
@@ -465,7 +465,10 @@ function ble-syntax/print-status/nest.get-text {
     if [[ $nparam == none ]]; then
       nparam=
     else
-      nparam=" nparam=${nparam//$_ble_term_FS/$'\e[7m^\\\e[m'}"
+      # Note #D1774: bash-3.0 bug "${var//../$'...'}" とすると $'' の引用符が残
+      #   る問題の回避の為に行を分けて代入する。
+      nparam=${nparam//$_ble_term_FS/$'\e[7m^\\\e[m'}
+      nparam=" nparam=$nparam"
     fi
 
     nest=" nest=($nctx w=$nword n=$nnest t=$nchild:$nprev$nparam)"
@@ -520,7 +523,10 @@ function ble-syntax/print-status/stat.get-text {
     if [[ $snparam == none ]]; then
       snparam=
     else
-      snparam=" nparam=${snparam//"$_ble_term_FS"/$'\e[7m^\\\e[m'}"
+      # Note #D1774: bash-3.0 bug "${var//$'...'}" とすると余分な引用符が残る問
+      #   題を回避する為に行を分けて代入している。
+      snparam=${snparam//"$_ble_term_FS"/$'\e[7m^\\\e[m'}
+      snparam=" nparam=$snparam"
     fi
 
     local stat_lookahead=