Opravy z macos

rc/03-values.sh

@@ -1,12 +1,14 @@
-# Terminal colors
-LWS_RED=$(tput setaf 1)
-LWS_GREEN=$(tput setaf 2)
-LWS_CYAN=$(tput setaf 6)
-LWS_COLOR_RESET=$(tput sgr0)
+if [[ -n "${TERM:-}" ]] && can_run tput; then
+    # Terminal colors
+    LWS_RED=$(tput setaf 1)
+    LWS_GREEN=$(tput setaf 2)
+    LWS_CYAN=$(tput setaf 6)
+    LWS_COLOR_RESET=$(tput sgr0)
 
-# Bash prompt escape sequences
-LWS_PS1_USER='\u'
-LWS_PS1_HOST='\h'
-LWS_PS1_DIR='\w'
-LWS_PS1_TYPE='\$'
-LWS_PS1_USER_HOST="${LWS_GREEN}${LWS_PS1_USER}@${LWS_PS1_HOST}${LWS_COLOR_RESET}:${LWS_CYAN}${LWS_PS1_DIR}${LWS_COLOR_RESET}"
+    # Bash prompt escape sequences
+    LWS_PS1_USER='\u'
+    LWS_PS1_HOST='\h'
+    LWS_PS1_DIR='\w'
+    LWS_PS1_TYPE='\$'
+    LWS_PS1_USER_HOST="${LWS_GREEN}${LWS_PS1_USER}@${LWS_PS1_HOST}${LWS_COLOR_RESET}:${LWS_CYAN}${LWS_PS1_DIR}${LWS_COLOR_RESET}"
+fi

rc/brew.sh

@@ -1,9 +1,11 @@
 # Homebrew initialization
 # Can set BREW_HOME in advance
 
-xlog "Homebrew initialization"
+xlog "Homebrew/Linuxbrew initialization"
 
 BREW_LOCATIONS=(
+ "/opt/homebrew"
+ "/usr/local/Homebrew"
  "$HOME/.local/share/linuxbrew"
  "$HOME/.linuxbrew"
  "/home/linuxbrew/.linuxbrew"
@@ -28,8 +30,8 @@ if [[ -e "$BREW" ]]; then
   eval "$($BREW shellenv)"
   PATH="$path_backup"
 
-  append_path "$HOMEBREW_PREFIX/bin"
-  append_path "$HOMEBREW_PREFIX/sbin"
+  prepend_path "$HOMEBREW_PREFIX/bin"
+  prepend_path "$HOMEBREW_PREFIX/sbin"
 fi
 
 unset BREW

rc/sdkman.sh

@@ -1,4 +1,4 @@
-nop "${SDKMAN_DIR:=$HOME/.sdkman}"
+: "${SDKMAN_DIR:=$HOME/.sdkman}"
 if [[ -d $SDKMAN_DIR ]]; then
   export SDKMAN_DIR
   source_try "$SDKMAN_DIR/bin/sdkman-init.sh"