main: support MSYS

akinomyoga · Feb 6, 2020 · 500e051 · 500e051
1 parent 2423f4d
commit 500e051
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ble.pp b/ble.pp
@@ -291,7 +291,7 @@ function ble/util/readlink {
   ret=
   local path=$1
   case "$OSTYPE" in
-  (cygwin|linux-gnu)
+  (cygwin|msys|linux-gnu)
     # 少なくとも cygwin, GNU/Linux では readlink -f が使える
     ble/util/assign ret 'PATH=/bin:/usr/bin readlink -f "$path"' ;;
   (darwin*|*)

diff --git a/src/edit.sh b/src/edit.sh
@@ -4498,7 +4498,7 @@ if ((_ble_bash>=40000)); then
     fi
     local -x HISTTIMEFORMAT=__ble_ext__
     local -x INDEX_FILE=$history_indfile
-    local opt_cygwin=; [[ $OSTYPE == cygwin* ]] && opt_cygwin=1
+    local opt_cygwin=; [[ $OSTYPE == cygwin* || $OSTYPE == msys* ]] && opt_cygwin=1
 
     local apos=\'
     # 482ms for 37002 entries
@@ -4556,7 +4556,7 @@ if ((_ble_bash>=40000)); then
 
     local opt_async=; [[ $1 == async ]] && opt_async=1
     local opt_info=; ((_ble_edit_attached)) && [[ ! $opt_async ]] && opt_info=1
-    local opt_cygwin=; [[ $OSTYPE == cygwin* ]] && opt_cygwin=1
+    local opt_cygwin=; [[ $OSTYPE == cygwin* || $OSTYPE == msys* ]] && opt_cygwin=1
 
     local history_tmpfile=$_ble_base_run/$$.edit-history-load
     local history_indfile=$_ble_base_run/$$.edit-history-load-multiline-index

diff --git a/src/util.sh b/src/util.sh
@@ -1168,7 +1168,7 @@ if ((_ble_bash>=40400)) && ble/util/msleep/.check-builtin-sleep; then
   _ble_util_msleep_delay=300
   function ble/util/msleep/.core { builtin sleep "$1"; }
 elif ((_ble_bash>=40000)) && [[ $OSTYPE != haiku* && $OSTYPE != minix* ]]; then
-  if [[ $OSTYPE == cygwin* ]]; then
+  if [[ $OSTYPE == cygwin* || $OSTYPE == msys* ]]; then
     _ble_util_msleep_delay1=10000 # short msleep にかかる時間 [usec]
     _ble_util_msleep_delay2=50000 # /bin/sleep 0 にかかる時間 [usec]
     _ble_util_msleep_calibrated=0