From a681f12632fd61f40fbca15dfd203549ba0dfe72 Mon Sep 17 00:00:00 2001 From: chrischristiansen-glitch Date: Thu, 21 May 2026 03:00:53 +0200 Subject: [PATCH] Enhance OPAX boot script with GitHub auth check, combined green/red ready line, and add separate osv-github-auth.sh helper. Clear Cloud Shell welcome before OSVauco banner. --- scripts/osv-github-auth.sh | 48 ++++++++++++++++++++++++++++++++++++ scripts/osvauco-opax-boot.sh | 39 ++++++++++++++++++++++++++--- 2 files changed, 83 insertions(+), 4 deletions(-) create mode 100644 scripts/osv-github-auth.sh diff --git a/scripts/osv-github-auth.sh b/scripts/osv-github-auth.sh new file mode 100644 index 0000000..f0e922e --- /dev/null +++ b/scripts/osv-github-auth.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +# OSVauco GitHub auth helper – sjekker gh-status på en ryddig måte + +set -euo pipefail + +GREEN="$(tput setaf 2 || true)" +RED="$(tput setaf 1 || true)" +YELLOW="$(tput setaf 3 || true)" +BLUE="$(tput setaf 4 || true)" +BOLD="$(tput bold || true)" +RESET="$(tput sgr0 || true)" + +clear || true + +echo "============================================================" +echo " ${BOLD}O S V A U C O · G I T H U B${RESET}" +echo "============================================================" +echo + +if ! command -v gh >/dev/null 2>&1; then + echo " ${RED}❌ 'gh' (GitHub CLI) er ikke installert i denne miljøet.${RESET}" + echo " Installer via package manager hvis du trenger avansert GitHub-støtte." + exit 1 +fi + +if gh auth status >/dev/null 2>&1; then + echo " ${GREEN}✅ GitHub: gh auth status = OK${RESET}" + gh auth status +else + echo " ${YELLOW}⚠️ gh er ikke logget inn for denne shellen.${RESET}" + echo + read -r -p "[OSVauco/GH] Kjøre 'gh auth login' nå? (y/N): " ANSWER + case "$ANSWER" in + y|Y) + echo + gh auth login + echo + if gh auth status >/dev/null 2>&1; then + echo " ${GREEN}✅ GitHub: innlogging OK etter gh auth login.${RESET}" + else + echo " ${RED}❌ GitHub: fortsatt ikke logget inn – sjekk token/bruker.${RESET}" + fi + ;; + *) + echo " ${YELLOW}OK, gjør det senere manuelt med 'gh auth login'.${RESET}" + ;; + esac +fi diff --git a/scripts/osvauco-opax-boot.sh b/scripts/osvauco-opax-boot.sh index bb312ed..b322913 100644 --- a/scripts/osvauco-opax-boot.sh +++ b/scripts/osvauco-opax-boot.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# OSVauco OPAX boot — med session-logg, fargekoder og lett "maskin"-progress +# OSVauco OPAX boot — med session-logg, GitHub-sjekk og fargekodet statuslinje set -euo pipefail @@ -38,6 +38,7 @@ done_fail() { echo " ${RED}[FAIL]${RESET}" } +# Fjern Cloud Shell-velkomst ved å rydde skjermen før banneret clear || true echo "============================================================" @@ -65,9 +66,13 @@ fi echo " Forrige : $LAST_LINE" echo +OPAX_OK=0 +GH_OK=0 + # 1) Healthcheck mot OPAX-MCP step "Tester OPAX-MCP på: $PING_URL" if curl -fsS "$PING_URL" >/dev/null 2>&1; then + OPAX_OK=1 done_ok echo " ${GREEN}✅ OPAX-MCP: OK${RESET}" else @@ -77,18 +82,44 @@ fi echo +# 2) GitHub CLI-status +step "Sjekker GitHub-innlogging (gh auth status)" +if command -v gh >/dev/null 2>&1; then + if gh auth status >/dev/null 2>&1; then + GH_OK=1 + done_ok + else + done_warn + echo " ${YELLOW}⚠️ gh ikke logget inn — kjør 'gh auth login' senere hvis du trenger GitHub-CLI.${RESET}" + fi +else + done_warn + echo " ${YELLOW}⚠️ 'gh' ikke installert i denne shellen.${RESET}" +fi + +echo + mkdir -p "$(dirname "$LOG_FILE")" -# 2) Session-logg uten spørsmål (kan overrides via env) +# 3) Session-logg uten spørsmål (kan overrides via env) step "Logger sesjon til OSVAUCO_OPAX_SESSION_LOG.md" SESSION_DESC="${OSV_OPAX_SESSION_DESC:-"(ingen beskrivelse)"}" -echo "$SESSION_ID | $PROJECT_ID | $REGION | $ACCOUNT | $SESSION_DESC" >> "$LOG_FILE" && done_ok || done_fail +echo "$SESSION_ID | $PROJECT_ID | $REGION | $ACCOUNT | OPAX=$OPAX_OK | GH=$GH_OK | $SESSION_DESC" >> "$LOG_FILE" && done_ok || done_fail echo " Logg : ${GREEN}oppdatert${RESET} → $LOG_FILE" echo -# 3) Valgfri Gemini-oppstart +# 4) Oppsummering med grønn/rød kommandolinje +if [ "$OPAX_OK" -eq 1 ] && [ "$GH_OK" -eq 1 ]; then + echo " ${GREEN}▶ OSVAUCO/OPAX READY — Cloud Run + GitHub verifisert.${RESET}" +else + echo " ${RED}▶ OSVAUCO/OPAX PARTIAL — sjekk status over før du jobber videre.${RESET}" +fi + +echo + +# 5) Valgfri Gemini-oppstart step "Starte Gemini-CLI i ~/OSVauco?" read -r -p " [y/N]: " ANSWER case "$ANSWER" in