Compare commits

..

4 Commits

4 changed files with 16 additions and 10 deletions

View File

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: DictXiong/dotfiles
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/DictXiong
dst: gitee/dictxiong

View File

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: ohmyzsh repo
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/ohmyzsh
dst: gitee/dictxiong
@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: zsh-users repos
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/zsh-users
dst: gitee/dictxiong
@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: zdharma-continuum repos
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/zdharma-continuum
dst: gitee/dictxiong
@ -59,7 +59,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: thewtex/tmux-mem-cpu-load
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/thewtex
dst: gitee/dictxiong
@ -76,7 +76,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: tmux-plugins
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/tmux-plugins
dst: gitee/dictxiong
@ -93,7 +93,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: VundleVim/Vundle-vim
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/VundleVim
dst: gitee/dictxiong
@ -110,7 +110,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: joshdick/onedark-vim
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/joshdick
dst: gitee/dictxiong
@ -127,7 +127,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: junegunn/fzf
uses: Yikun/hub-mirror-action@v1.3
uses: Yikun/hub-mirror-action@v1.4
with:
src: github/junegunn
dst: gitee/dictxiong

View File

@ -16,6 +16,7 @@ export GPG_TTY=$(tty)
export LESS_TERMCAP_md=$'\E[01;33m'
# env for dfs
if [[ -f ~/.config/dotfiles/env ]]; then set -a; source ~/.config/dotfiles/env; set +a; fi
export DFS_OS_TYPE="$("$DOTFILES/tools/common.sh" get_os_type)"
# antigen
if [[ "$DFS_NO_WALL" == "1" ]]; then
@ -104,7 +105,8 @@ alias "se"='sudo -sE'
alias "sl"='sudo zsh -l'
alias "cps"='rsync -avh --info=progress2'
alias "mvs"='rsync -avh --info=progress2 --remove-source-files'
if [[ $("$DOTFILES/tools/common.sh" get_os_type) == "linux" ]]; then alias "ping"='ping -n'; fi
if [[ "$DFS_OS_TYPE" == "linux" ]]; then alias "ping"='ping -n'; alias "ping6"='ping6 -n'; fi
if [[ "$DFS_OS_TYPE" == "msys" ]]; then alias "tmux"='script -qO /dev/null -c "tmux -u"'; fi
alias "pbd"='ping baidu.com'
alias "p114"='ping 114.114.114.114'
alias "p666"='ping6 2001:da8::666'

View File

@ -190,6 +190,7 @@ apost_beacon()
get_os_type()
{
test -z "$DFS_OS_TYPE" || ( echo "$DFS_OS_TYPE"; return )
local ans="unknown"
case "$(uname -s)" in
Darwin*) ans="MacOS";;
@ -198,11 +199,13 @@ get_os_type()
Linux* ) ans="Linux";;
*) ans="unknown";;
esac
export DFS_OS_TYPE="$ans"
echo $ans | tr '[:upper:]' '[:lower:]'
}
get_linux_dist()
{
test -z "$DFS_LINUX_DIST" || ( echo "$DFS_LINUX_DIST"; return )
local ans="unknown"
if [ -f /etc/os-release ]; then
. /etc/os-release
@ -221,6 +224,7 @@ get_linux_dist()
else
ans="unknown"
fi
export DFS_LINUX_DIST="$ans"
echo $ans | tr '[:upper:]' '[:lower:]'
}