diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a62729..832724b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: run: | rev=`git rev-parse HEAD` pwd - export DFS_NO_COMPILE=1 DFS_NO_UPDATE=1 + export DFS_NO_COMPILE=1 DFS_DEV=1 ./install.sh test `git rev-parse HEAD` = "$rev" @@ -70,7 +70,7 @@ jobs: run: | rev=`git rev-parse HEAD` pwd - export DFS_NO_COMPILE=1 DFS_NO_UPDATE=1 + export DFS_NO_COMPILE=1 DFS_DEV=1 ./install.sh test `git rev-parse HEAD` = "$rev" diff --git a/.update.sh b/.update.sh index ad98d33..a3f0579 100644 --- a/.update.sh +++ b/.update.sh @@ -25,7 +25,11 @@ if [[ "$(git rev-parse HEAD)" == "$dfs_commit" ]]; then post_log "INFO" "$THIS_FILE" "nothing to do" else fmt_info "checking out to commit $dfs_commit ..." - git -c advice.detachedHead=false checkout $dfs_commit + if [[ -z "DFS_DEV" ]]; then + git -c advice.detachedHead=false checkout $dfs_commit + else + fmt_warning "won't really checkout in dev mode" + done post_log "INFO" "$THIS_FILE" "will check out to commit $dfs_commit" cp ./.update.sh ./update.sh && chmod +x ./update.sh && exit fi diff --git a/install.sh b/install.sh index 01db809..a315f49 100755 --- a/install.sh +++ b/install.sh @@ -142,10 +142,8 @@ install_update(){ fmt_note "installing update.sh ..." cp "${DOTFILES}/.update.sh" "${DOTFILES}/update.sh" chmod +x "${DOTFILES}/update.sh" - if [[ -z "$DFS_NO_UPDATE" ]]; then - fmt_note "running update.sh ..." - ${DOTFILES}/update.sh - fi + fmt_note "running update.sh ..." + ${DOTFILES}/update.sh } uninstall_update(){