Compare commits

..

No commits in common. "5938ca8d22d53c7b943bac8ae7840b6b5631626c" and "fe938f113b7c911ee7f2f0b5cda3552411bb7ab9" have entirely different histories.

3 changed files with 5 additions and 9 deletions

View File

@ -108,8 +108,10 @@ 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))"'
alias "ls"='ls --color=tty' case $(bash "$DOTFILES/tools/common.sh" get_os_type) in
alias "l"='ls -lAGh --time-style="+%y-%m-%d %H:%M"' macos ) alias l='ls -lAGh -D "%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 coreutils brew install git zsh curl tmux vim util-linux
} }
router() router()

View File

@ -3,12 +3,6 @@
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