DictXiong/dotfiles
1
0
Fork 0
mirror of https://github.com/DictXiong/dotfiles.git synced 2025-04-25 03:37:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

auto-detect DFS_NO_WALL

Browse Source
This commit is contained in:
xiongdian.me 2023-01-06 15:33:54 +08:00
parent 9ab5b608c8
commit a70a97e0d0
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/test.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
rev=`git rev-parse HEAD` rev=`git rev-parse HEAD`
pwd pwd
set -x set -x
./install.sh -adl DFS_NO_WALL=0 ./install.sh -adl
test `git rev-parse HEAD` = "$rev" test `git rev-parse HEAD` = "$rev"
- name: antigen build - name: antigen build
@ -36,8 +36,6 @@ jobs:
- name: antigen build with DFS_NO_WALL - name: antigen build with DFS_NO_WALL
shell: /bin/zsh -ileo PIPE_FAIL {0} shell: /bin/zsh -ileo PIPE_FAIL {0}
env:
DFS_NO_WALL: 1
run: | run: |
echo $SHELL echo $SHELL
antigen list antigen list
@ -60,7 +58,7 @@ jobs:
rev=`git rev-parse HEAD` rev=`git rev-parse HEAD`
pwd pwd
set -x set -x
./install.sh -adl DFS_NO_WALL=0 ./install.sh -adl
test `git rev-parse HEAD` = "$rev" test `git rev-parse HEAD` = "$rev"
- name: antigen build - name: antigen build
@ -79,8 +77,6 @@ jobs:
- name: antigen build with DFS_NO_WALL - name: antigen build with DFS_NO_WALL
shell: /bin/zsh -ileo PIPE_FAIL {0} shell: /bin/zsh -ileo PIPE_FAIL {0}
env:
DFS_NO_WALL: 1
run: | run: |
echo $SHELL echo $SHELL
antigen list antigen list
@ -109,10 +105,8 @@ jobs:
./install.sh -dal ./install.sh -dal
test `git rev-parse HEAD` = "$rev" test `git rev-parse HEAD` = "$rev"
- name: antigen build with DFS_NO_WALL - name: antigen build
shell: /bin/zsh -ileo PIPE_FAIL {0} shell: /bin/zsh -ileo PIPE_FAIL {0}
env:
DFS_NO_WALL: 1
run: | run: |
echo $SHELL echo $SHELL
antigen list antigen list

2
.zshrc2
View File

@ -14,6 +14,8 @@ export EDITOR='vim'
export PYTHONIOENCODING='UTF-8' export PYTHONIOENCODING='UTF-8'
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
export LESS_TERMCAP_md=$'\E[01;33m' 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
# antigen # antigen
if [[ -z "$DFS_NO_WALL" ]]; then if [[ -z "$DFS_NO_WALL" ]]; then

13
install.sh
View File

@ -84,6 +84,13 @@ preinstall_check()
prepare_config() prepare_config()
{ {
local remote=$(cd "$DOTFILES" && git remote get-url origin)
if [[ -z "$DFS_NO_WALL" && $remote == *github* ]]; then
DFS_CONFIGS+=("DFS_NO_WALL=1")
fi
if [[ ${#DFS_CONFIGS[@]} == 0 ]]; then
return
fi
fmt_note "preparing dotfiles configurations ..." fmt_note "preparing dotfiles configurations ..."
local key value local key value
for i in "${DFS_CONFIGS[@]}"; do for i in "${DFS_CONFIGS[@]}"; do
@ -107,7 +114,7 @@ install_file_content()
fmt_note "installing file content ..." fmt_note "installing file content ..."
for ((i=0; i<${#HOME_FILES_PATH[@]}; i++)); do for ((i=0; i<${#HOME_FILES_PATH[@]}; i++)); do
local filename="$HOME/${HOME_FILES_PATH[$i]}" local filename="$HOME/${HOME_FILES_PATH[$i]}"
local content=${HOME_FILES_CONTENT[$i]} local content="${HOME_FILES_CONTENT[$i]}"
fmt_info "installing \"$content\" into \"$filename\" ..." fmt_info "installing \"$content\" into \"$filename\" ..."
mkdir -p $(dirname "$filename") mkdir -p $(dirname "$filename")
if [ ! -f "$filename" ]; then if [ ! -f "$filename" ]; then
@ -260,9 +267,7 @@ install()
if [[ "$INSTALL_DEP" == "1" ]]; then install_dependencies; fi if [[ "$INSTALL_DEP" == "1" ]]; then install_dependencies; fi
install_update install_update
preinstall_check preinstall_check
if [[ ${#DFS_CONFIGS[@]} > 0 ]]; then prepare_config
prepare_config
fi
install_crontab install_crontab
install_file_content install_file_content
install_symlink install_symlink