util(ble/util/eval-pathname-expansion): fix restoring shopt options i…

…n bash-4.0
akinomyoga · Jul 9, 2022 · d3b3f7b · d3b3f7b
1 parent 82c9934
commit d3b3f7b
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/util.sh b/src/util.sh
@@ -1553,7 +1553,16 @@ function ble/util/eval-pathname-expansion {
   local canon=
   if [[ :$2: == *:canonical:* ]]; then
     canon=1
-    local set=$- shopt=$BASHOPTS gignore=$GLOBIGNORE
+    local set=$- shopt gignore=$GLOBIGNORE
+    if ((_ble_bash>=40100)); then
+      shopt=$BASHOPTS
+    else
+      shopt=
+      shopt -q failglob && shopt=$shopt:failglob
+      shopt -q nullglob && shopt=$shopt:nullglob
+      shopt -q extglob && shopt=$shopt:extglob
+      shopt -q dotglob && shopt=$shopt:dotglob
+    fi
     shopt -u failglob
     shopt -s nullglob
     shopt -s extglob