From eaa417166a218567d62b5d5504f4f246b1e73045 Mon Sep 17 00:00:00 2001 From: bangdk Date: Sat, 9 Nov 2024 09:20:59 +0900 Subject: [PATCH] auto commit --- dev_git_only.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dev_git_only.sh b/dev_git_only.sh index d5f73b5..5e7bc67 100755 --- a/dev_git_only.sh +++ b/dev_git_only.sh @@ -9,9 +9,25 @@ git push origin $current_branch # 마스터 브랜치와 병합 여부 확인 echo "You are currently on branch: $current_branch" echo "Would you like to merge the current branch with master? (Y/N) [Y]" -read proceed_merge + +# 10초 타이머 설정 +TIMEOUT=10 +REPLY="" + +# 카운트다운 타이머와 함께 입력 받기 +while [ $TIMEOUT -gt 0 ] && [ -z "$REPLY" ]; do + echo -ne "\rWaiting for input... ($TIMEOUT seconds remaining)" + read -t 1 REPLY + ((TIMEOUT--)) +done + +echo # 새 줄 추가 + + proceed_merge=${proceed_merge:-Y} +echo "Selected option: $proceed_merge" + if [ "$proceed_merge" == "Y" ] || [ "$proceed_merge" == "y" ]; then # 마스터 브랜치로 전환 및 업데이트 git checkout master