diff --git a/ci/release/template/scripts/lib.sh b/ci/release/template/scripts/lib.sh
index 17e166197..bfed4d18a 100644
--- a/ci/release/template/scripts/lib.sh
+++ b/ci/release/template/scripts/lib.sh
@@ -353,6 +353,35 @@ if [ "${LIB_RELEASE-}" ]; then
 fi
 LIB_RELEASE=1
 
+ensure_os() {
+  if [ -n "${OS-}" ]; then
+    # Windows defines OS=Windows_NT.
+    if [ "$OS" == Windows_NT ]; then
+      OS=windows
+    fi
+    return
+  fi
+  uname=$(uname)
+  case $uname in
+    Linux) OS=linux;;
+    Darwin) OS=macos;;
+    FreeBSD) OS=freebsd;;
+    *) OS=$uname;;
+  esac
+}
+
+ensure_arch() {
+  if [ -n "${ARCH-}" ]; then
+    return
+  fi
+  uname_m=$(uname -m)
+  case $uname_m in
+    aarch64) ARCH=arm64;;
+    x86_64) ARCH=amd64;;
+    *) ARCH=$uname_m;;
+  esac
+}
+
 ensure_goos() {
   if [ -n "${GOOS-}" ]; then
     return
@@ -374,34 +403,6 @@ ensure_goarch() {
   esac
 }
 
-ensure_os() {
-  if [ -n "${_OS-}" ]; then
-    return
-  fi
-  uname=$(uname)
-  case $uname in
-    Linux) OS=linux;;
-    Darwin) OS=macos;;
-    FreeBSD) OS=freebsd;;
-    MINGW32_NT*) OS=windows;;
-    *) OS=$uname;;
-  esac
-  # We cannot use $OS to check as $OS is defined in MinGW terminals by default.
-  _OS=1
-}
-
-ensure_arch() {
-  if [ -n "${ARCH-}" ]; then
-    return
-  fi
-  uname_m=$(uname -m)
-  case $uname_m in
-    aarch64) ARCH=arm64;;
-    x86_64) ARCH=amd64;;
-    *) ARCH=$uname_m;;
-  esac
-}
-
 gh_repo() {
   gh repo view --json nameWithOwner --template '{{ .nameWithOwner }}'
 }
diff --git a/ci/sub b/ci/sub
index 66692a2f3..7a098b36a 160000
--- a/ci/sub
+++ b/ci/sub
@@ -1 +1 @@
-Subproject commit 66692a2f312d37a41de6b505842637f644a65eb1
+Subproject commit 7a098b36a1bb9a5b894c596a6cccd029b6f3359d
diff --git a/install.sh b/install.sh
index bd5c44b9b..dc01654d3 100755
--- a/install.sh
+++ b/install.sh
@@ -489,6 +489,35 @@ if [ "${LIB_RELEASE-}" ]; then
 fi
 LIB_RELEASE=1
 
+ensure_os() {
+  if [ -n "${OS-}" ]; then
+    # Windows defines OS=Windows_NT.
+    if [ "$OS" == Windows_NT ]; then
+      OS=windows
+    fi
+    return
+  fi
+  uname=$(uname)
+  case $uname in
+    Linux) OS=linux;;
+    Darwin) OS=macos;;
+    FreeBSD) OS=freebsd;;
+    *) OS=$uname;;
+  esac
+}
+
+ensure_arch() {
+  if [ -n "${ARCH-}" ]; then
+    return
+  fi
+  uname_m=$(uname -m)
+  case $uname_m in
+    aarch64) ARCH=arm64;;
+    x86_64) ARCH=amd64;;
+    *) ARCH=$uname_m;;
+  esac
+}
+
 ensure_goos() {
   if [ -n "${GOOS-}" ]; then
     return
@@ -510,34 +539,6 @@ ensure_goarch() {
   esac
 }
 
-ensure_os() {
-  if [ -n "${_OS-}" ]; then
-    return
-  fi
-  uname=$(uname)
-  case $uname in
-    Linux) OS=linux;;
-    Darwin) OS=macos;;
-    FreeBSD) OS=freebsd;;
-    MINGW32_NT*) OS=windows;;
-    *) OS=$uname;;
-  esac
-  # We cannot use $OS to check as $OS is defined in MinGW terminals by default.
-  _OS=1
-}
-
-ensure_arch() {
-  if [ -n "${ARCH-}" ]; then
-    return
-  fi
-  uname_m=$(uname -m)
-  case $uname_m in
-    aarch64) ARCH=arm64;;
-    x86_64) ARCH=amd64;;
-    *) ARCH=$uname_m;;
-  esac
-}
-
 gh_repo() {
   gh repo view --json nameWithOwner --template '{{ .nameWithOwner }}'
 }