Deploy: GitHub submodule sync 2026-07-24 09:27:56

server-dev/start-all-server.sh

@@ -3,6 +3,7 @@
 #
 #   ./server-dev/start-all-server.sh
 #   ./server-dev/start-all-server.sh --no-build
+#   ./server-dev/start-all-server.sh --skip-desktop
 #   ./server-dev/start-all-server.sh --skip-java
 #   ./server-dev/start-all-server.sh --skip-legacy-stop
 #   ./server-dev/start-all-server.sh --no-pull      # git 동기화 생략
@@ -23,6 +24,7 @@ RAG_DIR="${ROOT_DIR}/exAiChatBot-chatbot2.0-agent"
 API_DIR="${ROOT_DIR}/chatbotApi-chatbot2.0-agent"
 SKILL_DIR="${ROOT_DIR}/kakaoChatbotSkill-chatbot2.0-agent"
 APP_DIR="${ROOT_DIR}/chatbotApp-chatbot2.0-agent"
+DESKTOP_DIR="${ROOT_DIR}/chatbotDesktopApp-chatbot2.0"
 
 ENV_TEMPLATE="${SERVER_DEV_DIR}/env.exdev-server.template"
 RAG_ENV="${RAG_DIR}/.env"
@@ -47,6 +49,7 @@ NO_BUILD=false
 SKIP_JAVA=false
 SKIP_LEGACY_STOP=false
 SKIP_CADDY=false
+SKIP_DESKTOP=false
 NO_PULL=false
 NO_PUSH=false
 LOCAL_DEV=false
@@ -58,11 +61,12 @@ for arg in "$@"; do
     --skip-java)         SKIP_JAVA=true ;;
     --skip-legacy-stop)  SKIP_LEGACY_STOP=true ;;
     --skip-caddy)        SKIP_CADDY=true ;;
+    --skip-desktop)      SKIP_DESKTOP=true ;;
     --no-pull)           NO_PULL=true ;;
     --no-push)           NO_PUSH=true ;;
     --local)             LOCAL_DEV=true ;;
     -h|--help)
-      sed -n '2,12p' "$0"
+      sed -n '2,14p' "$0"
       exit 0
       ;;
     *)
@@ -165,6 +169,20 @@ build_chatbot_app_for_deploy() {
   bash "${APP_DIR}/build.sh"
   [[ -f "${APP_DIR}/public/index.html" ]] || fail "chatbotApp public/ 빌드 실패"
   [[ -f "${APP_DIR}/public-ai/index.html" ]] || fail "chatbotApp public-ai/ 빌드 실패"
+  build_desktop_app
+}
+
+build_desktop_app() {
+  if $NO_BUILD || $SKIP_DESKTOP; then
+    log "데스크톱 앱 빌드 생략 (--no-build/--skip-desktop)"
+    return 0
+  fi
+  [[ -d "${DESKTOP_DIR}" ]] || fail "데스크톱 앱 디렉터리 없음: ${DESKTOP_DIR}"
+  chmod +x "${DESKTOP_DIR}/build-and-publish.sh"
+  log "chatbotDesktopApp Electron 재빌드 + downloads 배포..."
+  # 서버/원격 배포용: Mac + Windows 모두 생성
+  SKIP_WIN="${SKIP_WIN:-0}" SKIP_MAC="${SKIP_MAC:-0}" \
+    bash "${DESKTOP_DIR}/build-and-publish.sh"
 }
 
 deploy_from_local_mac() {
@@ -223,7 +241,8 @@ sync_source_from_git() {
   chmod +x "${tree}/server-dev/"*.sh 2>/dev/null || true
   chmod +x "${tree}/git_fetch_all.sh" 2>/dev/null || true
   chmod +x "${tree}/chatbotApp-chatbot2.0-agent/build.sh" 2>/dev/null || true
-  chmod +x "${tree}/start-all-server.sh" "${tree}/stop-all-server.sh" 2>/dev/null || true
+  chmod +x "${tree}/chatbotDesktopApp-chatbot2.0/build-and-publish.sh" 2>/dev/null || true
+  chmod +x "${tree}/start-all-server.sh" "${tree}/stop-all-server.sh" "${tree}/start-all.sh" 2>/dev/null || true
 }
 
 is_exdev_server() {
@@ -236,6 +255,7 @@ run_local_dev() {
   local -a args=()
   $NO_BUILD && args+=(--no-build)
   $SKIP_JAVA && args+=(--skip-java)
+  $SKIP_DESKTOP && args+=(--skip-desktop)
   if ((${#args[@]} > 0)); then
     exec "${ROOT_DIR}/local-dev/start-all.sh" "${args[@]}"
   else
@@ -437,6 +457,7 @@ build_chatbot_app() {
     npm ci --prefer-offline 2>/dev/null || npm install
   )
   bash "${APP_DIR}/build.sh"
+  build_desktop_app
 }
 
 start_chatbot_app() {