From b631ab6fcab65a79dd5224d5fef0c50d0fe6ab95 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Sun, 14 Jan 2024 16:00:20 +0800 Subject: [PATCH 1/3] fix #460: wrong android icon --- functions/_tide_detect_os.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/_tide_detect_os.fish b/functions/_tide_detect_os.fish index cf38388b..168095b6 100644 --- a/functions/_tide_detect_os.fish +++ b/functions/_tide_detect_os.fish @@ -10,7 +10,7 @@ function _tide_detect_os printf %s\n  FFFFFF 00CCFF # https://answers.microsoft.com/en-us/windows/forum/all/what-is-the-official-windows-8-blue-rgb-or-hex/fd57144b-f69b-42d8-8c21-6ca911646e44 case linux if test (uname -o) = Android - echo ﲎ # This character is evil and messes up code display, so it's put on its own line + echo  # This character is evil and messes up code display, so it's put on its own line # https://developer.android.com/distribute/marketing-tools/brand-guidelines printf %s\n 3DDC84 3C3F41 # fg is from above link, bg is from Android Studio default dark theme else From c52ca4db698ec7498e63748c420a22b90d6d85e0 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Sun, 14 Jan 2024 16:04:11 +0800 Subject: [PATCH 2/3] Update test --- tests/detect_os/_tide_detect_os.test.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/detect_os/_tide_detect_os.test.fish b/tests/detect_os/_tide_detect_os.test.fish index 81498edb..764c07f7 100644 --- a/tests/detect_os/_tide_detect_os.test.fish +++ b/tests/detect_os/_tide_detect_os.test.fish @@ -11,7 +11,7 @@ _tide_detect_os mock uname \* "echo Linux" mock uname -o "echo Android" _tide_detect_os -# CHECK: ﲎ +# CHECK:  # CHECK: 3DDC84 # CHECK: 3C3F41 From 2d91f3b9096bb3c6cba61272f0a631f33e658828 Mon Sep 17 00:00:00 2001 From: Ilan Cosman Date: Tue, 16 Jan 2024 10:38:15 -0800 Subject: [PATCH 3/3] Remove extra line --- functions/_tide_detect_os.fish | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/functions/_tide_detect_os.fish b/functions/_tide_detect_os.fish index 168095b6..bb58d07b 100644 --- a/functions/_tide_detect_os.fish +++ b/functions/_tide_detect_os.fish @@ -10,9 +10,8 @@ function _tide_detect_os printf %s\n  FFFFFF 00CCFF # https://answers.microsoft.com/en-us/windows/forum/all/what-is-the-official-windows-8-blue-rgb-or-hex/fd57144b-f69b-42d8-8c21-6ca911646e44 case linux if test (uname -o) = Android - echo  # This character is evil and messes up code display, so it's put on its own line # https://developer.android.com/distribute/marketing-tools/brand-guidelines - printf %s\n 3DDC84 3C3F41 # fg is from above link, bg is from Android Studio default dark theme + printf %s\n  3DDC84 3C3F41 # fg is from above link, bg is from Android Studio default dark theme else _tide_detect_os_linux_cases /etc/os-release ID || _tide_detect_os_linux_cases /etc/os-release ID_LIKE ||