From a70a97e0d0e56dc8f1171cdab7d8b564c196646d Mon Sep 17 00:00:00 2001 From: "xiongdian.me" Date: Fri, 6 Jan 2023 15:33:54 +0800 Subject: [PATCH] auto-detect DFS_NO_WALL --- .github/workflows/test.yml | 12 +++--------- .zshrc2 | 2 ++ install.sh | 13 +++++++++---- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 583b5bc..9d3abb4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: rev=`git rev-parse HEAD` pwd set -x - ./install.sh -adl + DFS_NO_WALL=0 ./install.sh -adl test `git rev-parse HEAD` = "$rev" - name: antigen build @@ -36,8 +36,6 @@ jobs: - name: antigen build with DFS_NO_WALL shell: /bin/zsh -ileo PIPE_FAIL {0} - env: - DFS_NO_WALL: 1 run: | echo $SHELL antigen list @@ -60,7 +58,7 @@ jobs: rev=`git rev-parse HEAD` pwd set -x - ./install.sh -adl + DFS_NO_WALL=0 ./install.sh -adl test `git rev-parse HEAD` = "$rev" - name: antigen build @@ -79,8 +77,6 @@ jobs: - name: antigen build with DFS_NO_WALL shell: /bin/zsh -ileo PIPE_FAIL {0} - env: - DFS_NO_WALL: 1 run: | echo $SHELL antigen list @@ -109,10 +105,8 @@ jobs: ./install.sh -dal test `git rev-parse HEAD` = "$rev" - - name: antigen build with DFS_NO_WALL + - name: antigen build shell: /bin/zsh -ileo PIPE_FAIL {0} - env: - DFS_NO_WALL: 1 run: | echo $SHELL antigen list diff --git a/.zshrc2 b/.zshrc2 index 014b5a7..75db74f 100644 --- a/.zshrc2 +++ b/.zshrc2 @@ -14,6 +14,8 @@ export EDITOR='vim' export PYTHONIOENCODING='UTF-8' 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 # antigen if [[ -z "$DFS_NO_WALL" ]]; then diff --git a/install.sh b/install.sh index 14a274e..cf8e750 100755 --- a/install.sh +++ b/install.sh @@ -84,6 +84,13 @@ preinstall_check() 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 ..." local key value for i in "${DFS_CONFIGS[@]}"; do @@ -107,7 +114,7 @@ install_file_content() fmt_note "installing file content ..." for ((i=0; i<${#HOME_FILES_PATH[@]}; i++)); do 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\" ..." mkdir -p $(dirname "$filename") if [ ! -f "$filename" ]; then @@ -260,9 +267,7 @@ install() if [[ "$INSTALL_DEP" == "1" ]]; then install_dependencies; fi install_update preinstall_check - if [[ ${#DFS_CONFIGS[@]} > 0 ]]; then - prepare_config - fi + prepare_config install_crontab install_file_content install_symlink