main (ble-update): fix a bug that the check of "make" does not work i…

…n Bash 3.2
akinomyoga · Jan 24, 2020 · 840d6d6 · 840d6d6
1 parent 057183c
commit 840d6d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ble.pp b/ble.pp
@@ -525,7 +525,7 @@ function ble-update {
   local MAKE=
   if type gmake &>/dev/null; then
     MAKE=gmake
-  elif type make &>/dev/null && make --version |& grep -qiF 'GNU Make'; then
+  elif type make &>/dev/null && make --version 2>&1 | grep -qiF 'GNU Make'; then
     MAKE=make
   else
     echo "ble-update: GNU Make is not available." >&2

diff --git a/lib/core-syntax.sh b/lib/core-syntax.sh
@@ -2951,7 +2951,10 @@ function ble/syntax:bash/ctx-command/.check-delimiter-or-redirect {
     fi
     ((i+=len))
     return 0
-  elif local rex='^(&&|\|[|&]?)|^;(;&?|&)|^[;&]' && [[ $tail =~ $rex ]]; then
+  elif local rex='^(&&|\|[|&]?)|^;(;&?|&)|^[;&]'
+       ((_ble_bash<40000)) && rex='^(&&|\|\|?)|^;(;)|^[;&]'
+       [[ $tail =~ $rex ]]
+  then
     # 制御演算子 && || | & ; |& ;; ;;& ;&
 
     if [[ $BASH_REMATCH == ';' ]]; then