diff --git a/scripts/server-rebuild-exdev.sh b/scripts/server-rebuild-exdev.sh index ab11c87..9b6da23 100755 --- a/scripts/server-rebuild-exdev.sh +++ b/scripts/server-rebuild-exdev.sh @@ -59,19 +59,18 @@ log "bare 저장소 초기화" git init --bare "$GIT_DIR" git --git-dir="$GIT_DIR" symbolic-ref HEAD refs/heads/main -# ── 4. 레거시 work-tree 제거·단일 경로 고정 ───────────────────────────────── +# ── 4. 레거시 work-tree 완전 제거 (심볼릭 링크·디렉터리 모두 삭제) ─────────── LEGACY_WORK_TREE="/Users/aidev/dev/goldenChart" if [ -e "$LEGACY_WORK_TREE" ] || [ -L "$LEGACY_WORK_TREE" ]; then - log "레거시 경로 백업·이동: $LEGACY_WORK_TREE" + log "레거시 경로 제거: $LEGACY_WORK_TREE" if [ -d "$LEGACY_WORK_TREE" ] && [ ! -L "$LEGACY_WORK_TREE" ]; then tar -czf "$BACKUP_ROOT/legacy-dev-goldenChart.tgz" -C "$(dirname "$LEGACY_WORK_TREE")" "$(basename "$LEGACY_WORK_TREE")" 2>/dev/null || true - mv "$LEGACY_WORK_TREE" "$BACKUP_ROOT/legacy-dev-goldenChart-dir" 2>/dev/null || true + mv "$LEGACY_WORK_TREE" "$BACKUP_ROOT/legacy-dev-goldenChart-dir" 2>/dev/null || rm -rf "$LEGACY_WORK_TREE" else rm -f "$LEGACY_WORK_TREE" 2>/dev/null || true fi fi -ln -sfn "$WORK_TREE" "$LEGACY_WORK_TREE" -log " → $LEGACY_WORK_TREE → $WORK_TREE (심볼릭 링크)" +[ ! -e "$LEGACY_WORK_TREE" ] && log " → $LEGACY_WORK_TREE 없음 (단일 경로: $WORK_TREE)" # ── 5. work-tree 정리 (중첩 .git 제거, 소스만 비움) ─────────────────────── log "work-tree 정리: $WORK_TREE" diff --git a/scripts/upload-android-apk.sh b/scripts/upload-android-apk.sh index 768f45d..04a74a5 100755 --- a/scripts/upload-android-apk.sh +++ b/scripts/upload-android-apk.sh @@ -54,7 +54,7 @@ print_usage() { 서버 경로 자동 탐색 순서: 1) --project-dir / REMOTE_PROJECT_DIR 2) SSH → deploy.sh 의 WORK_TREE - 3) 후보: /Users/aidev/apps/goldenChart, /Users/aidev/dev/goldenChart + 3) 후보: /Users/aidev/apps/goldenChart 설정 파일: scripts/deploy-target.defaults scripts/deploy-target.local.env (선택, gitignore) @@ -106,7 +106,6 @@ resolve_remote_project_dir() { if [[ "$origin_url" == *goldenChart* ]]; then for candidate in \ /Users/aidev/apps/goldenChart \ - /Users/aidev/dev/goldenChart \ /Volumes/ADATA/apps/goldenChart; do if remote_exec "test -f \"$candidate/docker-compose.yml\"" >/dev/null 2>&1; then echo "$candidate"