updates for macos setup fixes
This commit is contained in:
+3
-5
@@ -3,8 +3,6 @@ function SETUP__CONFIG() {
|
||||
|
||||
GENERATE_INITIAL_LOCAL_CONFIG
|
||||
|
||||
SCWRYPTS system/config/update || return 1
|
||||
|
||||
CONFIG__ZSH || return 2
|
||||
CONFIG__VIM || return 3
|
||||
|
||||
@@ -18,7 +16,7 @@ function SETUP__CONFIG() {
|
||||
#####################################################################
|
||||
|
||||
GENERATE_INITIAL_LOCAL_CONFIG() {
|
||||
local HOSTNAME="$(hostnamectl --static || hostname | sed 's/\.local$//')"
|
||||
local HOSTNAME="$(hostnamectl --static 2>/dev/null || hostname | sed 's/\.local$//' 2>/dev/null)"
|
||||
[ ${HOSTNAME} ] || return 0
|
||||
|
||||
mkdir -p "${DOTWRYN_PATH}/bin/${HOSTNAME}"
|
||||
@@ -38,8 +36,8 @@ GENERATE_INITIAL_LOCAL_CONFIG() {
|
||||
alacritty/local.toml \
|
||||
;
|
||||
do
|
||||
mkdir -p -- "${DOTWRYN}/config/${HOSTNAME}/user/$(dirname -- "${LOCAL_OVERRIDE}")"
|
||||
touch -- "${DOTWRYN}/config/${HOSTNAME}/user/${LOCAL_OVERRIDE}"
|
||||
mkdir -p -- "${DOTWRYN_PATH}/config/${HOSTNAME}/user/$(dirname -- "${LOCAL_OVERRIDE}")"
|
||||
touch -- "${DOTWRYN_PATH}/config/${HOSTNAME}/user/${LOCAL_OVERRIDE}"
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,6 @@ libtool
|
||||
lolcat
|
||||
mono
|
||||
ncurses
|
||||
neofetch
|
||||
node
|
||||
npm
|
||||
openjdk
|
||||
|
||||
+5
-5
@@ -99,12 +99,12 @@ OS__INSTALL_MANAGED_DEPENDENCIES() {
|
||||
|
||||
case ${OS_NAME} in
|
||||
( macos )
|
||||
zsh -c 'source ~/.zprofile &>/dev/null; sed --version 2>&1 | grep GNU | grep -qv BSD' || {
|
||||
STATUS "detected BSD sed priority; updating GNU utilities in homebrew"
|
||||
for P in "$(brew --prefix)"/opt/*/libexec/gnubin; do export PATH="$P:$PATH"; done
|
||||
local P
|
||||
for P in "$(brew --prefix)"/opt/*/libexec/gnubin(N); do export PATH="${P}:${PATH}"; done
|
||||
|
||||
echo 'for P in "$(brew --prefix)"/opt/*/libexec/gnubin; do export PATH="$P:$PATH"; done' >> "${HOME}/.zprofile"
|
||||
}
|
||||
local gnubin_line='for P in "$(brew --prefix)"/opt/*/libexec/gnubin(N); do export PATH="${P}:${PATH}"; done'
|
||||
grep -qF "${gnubin_line}" "${HOME}/.zprofile" 2>/dev/null \
|
||||
|| echo "${gnubin_line}" >> "${HOME}/.zprofile"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -43,4 +43,4 @@ source "$DOTWRYN_PATH/setup/config.zsh"
|
||||
clear
|
||||
|
||||
# shhh don't worry about it
|
||||
[[ $CI -ne 0 ]] || {C=$((){B(){base64 -d};A="$(cat "$2")";for _ in {1..$1};do A=$(echo $A|B);done;echo $A} 7 "$DOTWRYN_PATH/setup/welcome");for ((i=0;i<${#C};i++));do [[ ${C:$i:1} =~ z ]] && M=$(utils.colors.random) && continue;printf "$M${C:$i:1}" none;sleep 0.01;done;echo;unset C M;}
|
||||
[[ $CI -ne 0 ]] || {C=$((){B(){base64 -d};A="$(cat "$2")";for _ in {1..$1};do A=$(echo $A|B);done;echo $A} 7 "$DOTWRYN_PATH/setup/welcome");for ((i=0;i<${#C};i++));do [[ ${C:$i:1} =~ z ]] && M=$(printf "\\033[1;3$((1+$RANDOM%5))m") && continue;printf "$M${C:$i:1}" none;sleep 0.01;done;echo;unset C M;}
|
||||
|
||||
Reference in New Issue
Block a user