eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[zsh] Move Darwin $OSBUILD, $OSVERSION, and $HWMODEL

Browse source 
Move them from init_env_Darwin to their own functions in the new zsh/func/darwin
directory.
This commit is contained in:
Eryn Wells 2023-03-27 10:38:07 -07:00
parent ace2f38ed2
commit 6276b5f40e
5 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
zsh/func/darwin/darwin-hardware-model Normal file
View file

@ -0,0 +1,11 @@
# Eryn Wells <eryn@erynwells.me>
darwin-hardware-model() {
if [[ -z "$darwin_hardware_model" ]]; then
darwin_hardware_model=`sysctl -n hw.model`
fi
return "$darwin_hardware_model"
}
darwin-hardware-model "$@"

11
zsh/func/darwin/darwin-os-build Normal file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env zsh
# Eryn Wells <eryn@erynwells.me>
darwin-os-build() {
if [[ -z "$darwin_os_build" ]]; then
darwin_os_build=`sysctl -n kern.osversion`
fi
echo "$darwin_os_build"
}
darwin-os-build "$@"

11
zsh/func/darwin/darwin-os-version Normal file
View file

@ -0,0 +1,11 @@
#!/usr/bin/env zsh
# Eryn Wells <eryn@erynwells.me>
darwin-os-version() {
if [[ -z "$darwin_os_version" ]]; then
darwin_os_version=`sysctl -n kern.osproductversion`
fi
echo "$darwin_os_version"
}
darwin-os-version "$@"

4
zsh/func/init_env_darwin
View file

@ -4,10 +4,6 @@
autoload append_to_path
autoload prepend_to_path
export OSBUILD=`sysctl -n kern.osversion`
export OSVERSION=`sysctl -n kern.osproductversion`
export HWMODEL=`sysctl -n hw.model`
export XCODE_LIBRARY="$HOME/Library/Developer/Xcode"
export XCODE_DERIVED_DATA="$XCODE_LIBRARY/DerivedData"
export XCODE_INSTALLS="$XCODE_LIBRARY/Installs"

6
zshenv
View file

@ -6,13 +6,13 @@ unsetopt GLOBAL_RCS
export SYS=`uname -s | tr A-Z a-z`
init_env_fpath() {
local USER_FPATH=( "$HOME/.zsh/func" )
local user_fpath=("$HOME/.zsh/func")
if [[ "$SYS" == "darwin" ]]; then
USER_FPATH=($USER_FPATH "$HOME/.zsh/func/darwin")
user_fpath=($user_fpath "$HOME/.zsh/func/darwin")
fi
fpath=($USER_FPATH $fpath)
fpath=($user_fpath $fpath)
}
init_env_fpath