From e0e22d112013aee22635b6afe4c2c9d1bf88cbf0 Mon Sep 17 00:00:00 2001
From: George Rodrigues <georgerodrigues@live.com.au>
Date: Mon, 3 Oct 2022 12:03:53 -0300
Subject: chore(docs): fix some typos (#11211)

---
 tools/require_tool.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/require_tool.sh b/tools/require_tool.sh
index 1fa77f77a..19c5f6fa9 100755
--- a/tools/require_tool.sh
+++ b/tools/require_tool.sh
@@ -107,7 +107,7 @@ usage() {
 NAME
     require_tool.sh - Ensure version of a tool is greater than the one expected
 
-SYNOPSYS
+SYNOPSIS
     require_tool.sh [ -h ]
                     [ --help ]
                     [ TOOL MIN_VERSION ]
-- 
cgit v1.2.3-70-g09d2


From f80cf12092edb1bed8b7972bc1b9d63c836a9be7 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Wed, 12 Oct 2022 10:49:44 +0200
Subject: fix: fix OSC 8 hyperlink escape sequences

---
 tools/install.sh | 2 +-
 tools/upgrade.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/install.sh b/tools/install.sh
index 495ad2c11..bc3723050 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -185,7 +185,7 @@ supports_truecolor() {
 fmt_link() {
   # $1: text, $2: url, $3: fallback mode
   if supports_hyperlinks; then
-    printf '\033]8;;%s\a%s\033]8;;\a\n' "$2" "$1"
+    printf '\033]8;;%s\033\\%s\033]8;;\033\\\n' "$2" "$1"
     return
   fi
 
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index afc6a98dd..2f3b4dae3 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -107,7 +107,7 @@ supports_truecolor() {
 fmt_link() {
   # $1: text, $2: url, $3: fallback mode
   if supports_hyperlinks; then
-    printf '\033]8;;%s\a%s\033]8;;\a\n' "$2" "$1"
+    printf '\033]8;;%s\033\\%s\033]8;;\033\\\n' "$2" "$1"
     return
   fi
 
-- 
cgit v1.2.3-70-g09d2


From ee4910e3b36dc5556cad567c3760ee500297cc8e Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Wed, 12 Oct 2022 10:55:02 +0200
Subject: fix: show full hyperlinks in Konsole (#10964)

Fixes #10964
---
 tools/install.sh | 10 ++++++++--
 tools/upgrade.sh | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/install.sh b/tools/install.sh
index bc3723050..fb6973dbc 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -156,11 +156,17 @@ supports_hyperlinks() {
     return 0
   fi
 
-  # Windows Terminal or Konsole also support hyperlinks
-  if [ -n "$WT_SESSION" ] || [ -n "$KONSOLE_VERSION" ]; then
+  # Windows Terminal also supports hyperlinks
+  if [ -n "$WT_SESSION" ]; then
     return 0
   fi
 
+  # Konsole supports hyperlinks, but it's an opt-in setting that can't be detected
+  # https://github.com/ohmyzsh/ohmyzsh/issues/10964
+  # if [ -n "$KONSOLE_VERSION" ]; then
+  #   return 0
+  # fi
+
   return 1
 }
 
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 2f3b4dae3..596a59302 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -78,11 +78,17 @@ supports_hyperlinks() {
     return 0
   fi
 
-  # Windows Terminal or Konsole also support hyperlinks
-  if [ -n "$WT_SESSION" ] || [ -n "$KONSOLE_VERSION" ]; then
+  # Windows Terminal also supports hyperlinks
+  if [ -n "$WT_SESSION" ]; then
     return 0
   fi
 
+  # Konsole supports hyperlinks, but it's an opt-in setting that can't be detected
+  # https://github.com/ohmyzsh/ohmyzsh/issues/10964
+  # if [ -n "$KONSOLE_VERSION" ]; then
+  #   return 0
+  # fi
+
   return 1
 }
 
-- 
cgit v1.2.3-70-g09d2


From 65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Fri, 14 Oct 2022 20:31:33 +0200
Subject: fix(installer): detect newer Git for Windows version errors (#11157)

Fixes #11157
---
 tools/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/install.sh b/tools/install.sh
index fb6973dbc..a6538f9d7 100755
--- a/tools/install.sh
+++ b/tools/install.sh
@@ -273,7 +273,7 @@ setup_ohmyzsh() {
   }
 
   ostype=$(uname)
-  if [ -z "${ostype%CYGWIN*}" ] && git --version | grep -q msysgit; then
+  if [ -z "${ostype%CYGWIN*}" ] && git --version | grep -Eq 'msysgit|windows'; then
     fmt_error "Windows/MSYS Git is not supported on Cygwin"
     fmt_error "Make sure the Cygwin git package is installed and is first on the \$PATH"
     exit 1
-- 
cgit v1.2.3-70-g09d2