Style fixes

mcornella · Jan 24, 2022 · 41dcc0c · 41dcc0c
1 parent 9261ef5
commit 41dcc0c
Showing 1 changed file with 34 additions and 26 deletions.
diff --git a/ohmyzsh-custom/oh-cli.zsh b/ohmyzsh-custom/oh-cli.zsh
@@ -15,10 +15,9 @@ for fn in ${(k)functions[(I)_omz::*]}; do
   functions[${fn//_omz/_oh::my}]="${${functions[$fn]//_omz::/_oh::my::}//omz/oh my}"
 done
 
+# Add logo command
 _oh::my::logo() {
-  local supports_truecolor=1
-
-  () {
+  supports_truecolor() {
     case "$COLORTERM" in
     truecolor|24bit) return 0 ;;
     esac
@@ -32,37 +31,47 @@ _oh::my::logo() {
     esac
 
     return 1
-  } || supports_truecolor=0
+  }
+
+  truecolor() {
+    printf '\033[38;2;%s;%s;%sm' $1 $2 $3
+  }
+
+  256color() {
+    printf '\033[38;5;%sm' $1
+  }
 
   local -a rainbow
-  if (( supports_truecolor )); then
+  if supports_truecolor; then
     rainbow=(
-      $'\033[38;2;255;0;0m'
-      $'\033[38;2;255;97;0m'
-      $'\033[38;2;247;255;0m'
-      $'\033[38;2;0;255;30m'
-      $'\033[38;2;77;0;255m'
-      $'\033[38;2;168;0;255m'
-      $'\033[38;2;245;0;172m'
+      "$(truecolor 255   0   0)"
+      "$(truecolor 255  97   0)"
+      "$(truecolor 247 255   0)"
+      "$(truecolor   0 255  30)"
+      "$(truecolor  77   0 255)"
+      "$(truecolor 168   0 255)"
+      "$(truecolor 245   0 172)"
     )
   else
     rainbow=(
-      $'\033[38;5;196m'
-      $'\033[38;5;202m'
-      $'\033[38;5;226m'
-      $'\033[38;5;082m'
-      $'\033[38;5;021m'
-      $'\033[38;5;093m'
-      $'\033[38;5;163m'
+      "$(256color 196)"
+      "$(256color 202)"
+      "$(256color 226)"
+      "$(256color 082)"
+      "$(256color 021)"
+      "$(256color 093)"
+      "$(256color 163)"
     )
   fi
 
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $rainbow $'\033[0m'
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $rainbow $'\033[0m'
-  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $rainbow $'\033[0m'
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $rainbow $'\033[0m'
-  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $rainbow $'\033[0m'
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $rainbow $'\033[0m'
+  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'     $rainbow $'\033[0m'
+  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'     $rainbow $'\033[0m'
+  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n' $rainbow $'\033[0m'
+  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'     $rainbow $'\033[0m'
+  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'   $rainbow $'\033[0m'
+  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'     $rainbow $'\033[0m'
+
+  unset -f truecolor 256color supports_truecolor
 }
 
 # Add 'oh my zsh' command to reload the zsh session
@@ -72,7 +81,6 @@ _oh::my::zsh() {
   print -ru2 ""
   print -ru2 -P "%F{yellow}Reloading the zsh session ...%f"
 
-
   _oh::my::reload
 }