Compare commits

..

3 Commits

Author SHA1 Message Date
xiongdian.me
5938ca8d22 try to fix ci for macos 2023-07-29 16:21:10 +08:00
xiongdian.me
aafafda412 zshrc: try to use gnu-ls 2023-07-29 16:10:52 +08:00
xiongdian.me
e57ec2dc5d zshrc: use gnu ls on mac 2023-07-29 15:59:53 +08:00
3 changed files with 9 additions and 5 deletions

View File

@ -108,10 +108,8 @@ alias "p666"='ping6 2001:da8::666'
alias "cbd"='curl http://www.baidu.com' alias "cbd"='curl http://www.baidu.com'
alias "cbds"='curl https://www.baidu.com' alias "cbds"='curl https://www.baidu.com'
alias "gdebug"='git add -A; git commit --allow-empty -m "bug fix ($(date))"' alias "gdebug"='git add -A; git commit --allow-empty -m "bug fix ($(date))"'
case $(bash "$DOTFILES/tools/common.sh" get_os_type) in alias "ls"='ls --color=tty'
macos ) alias l='ls -lAGh -D "%y-%m-%d %H:%M"' ;; alias "l"='ls -lAGh --time-style="+%y-%m-%d %H:%M"'
* ) alias l='ls -lAGh --time-style="+%y-%m-%d %H:%M"' ;;
esac
if [[ -x $(command -v trash) ]]; then if [[ -x $(command -v trash) ]]; then
alias "rm"="echo use the full path i.e. '/bin/rm'\; consider using trash" alias "rm"="echo use the full path i.e. '/bin/rm'\; consider using trash"
fi fi

View File

@ -6,7 +6,7 @@ source "$THIS_DIR/common.sh"
brew_install() brew_install()
{ {
# brew update # brew update
brew install git zsh curl tmux vim util-linux brew install git zsh curl tmux vim util-linux coreutils
} }
router() router()

View File

@ -3,6 +3,12 @@
set -ex set -ex
trap "dfs beacon gh.ci.fail" ERR trap "dfs beacon gh.ci.fail" ERR
# fix for macos
dfs cd
if [[ $(./tools/common.sh get_os_type) == "macos" ]]; then
export PATH="/usr/local/opt/coreutils/libexec/gnubin:/opt/homebrew/opt/coreutils/libexec/gnubin:${PATH}"
fi
# check files # check files
cd / cd /
l l