diff --git a/scripts/osvauco-opax-boot.sh b/scripts/osvauco-opax-boot.sh index 4edae5b..9a2f23a 100644 --- a/scripts/osvauco-opax-boot.sh +++ b/scripts/osvauco-opax-boot.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# OSVauco OPAX boot — nå med enkel session-logg +# OSVauco OPAX boot — med session-logg og tydelig grønn bekreftelse set -euo pipefail @@ -14,6 +14,7 @@ LOG_FILE="$HOME/OSVauco/docs/OSVAUCO_OPAX_SESSION_LOG.md" GREEN="$(tput setaf 2 || true)" RED="$(tput setaf 1 || true)" +YELLOW="$(tput setaf 3 || true)" RESET="$(tput sgr0 || true)" SESSION_ID="$(date '+%Y%m%d-%H%M%S')" @@ -40,7 +41,7 @@ echo " Repo : $REPO ($BRANCH)" echo " Session : $SESSION_ID" echo -echo " Forrige: $LAST_LINE" +echo " Forrige : $LAST_LINE" echo echo " Tester OPAX-MCP på: $PING_URL" @@ -57,7 +58,7 @@ mkdir -p "$(dirname "$LOG_FILE")" read -r -p "[OSVauco/OPAX] Kort beskrivelse av denne sesjonen: " SESSION_DESC || SESSION_DESC="(ingen beskrivelse)" echo "$SESSION_ID | $PROJECT_ID | $REGION | $ACCOUNT | $SESSION_DESC" >> "$LOG_FILE" -echo " Logg oppdatert: $LOG_FILE" +echo " Logg : ${GREEN}oppdatert${RESET} → $LOG_FILE" echo read -r -p "[OSVauco/OPAX] Starte Gemini-CLI i ~/OSVauco nå? (y/N): " ANSWER diff --git a/scripts/osvauco-startup.sh b/scripts/osvauco-startup.sh index 73dd6aa..933a8d8 100644 --- a/scripts/osvauco-startup.sh +++ b/scripts/osvauco-startup.sh @@ -3,11 +3,16 @@ set -euo pipefail +GREEN="$(tput setaf 2 || true)" +RED="$(tput setaf 1 || true)" +YELLOW="$(tput setaf 3 || true)" +RESET="$(tput sgr0 || true)" + clear # Guard: stopp hvis gcloud auth er utløpt if ! gcloud auth print-access-token >/dev/null 2>&1; then - echo "⚠️ gcloud auth utløpt — kjør: gcloud auth login --no-launch-browser" + echo "${RED}⚠️ gcloud auth utløpt — kjør: gcloud auth login --no-launch-browser${RESET}" exit 1 fi @@ -47,9 +52,9 @@ fi echo if [ "$ADC_OK" -eq 1 ]; then - echo " ADC : OK" + echo " ADC : ${GREEN}OK${RESET}" else - echo " ADC : MISSES TOKEN (kjør: gcloud auth application-default login)" + echo " ADC : ${YELLOW}MISSES TOKEN${RESET} (kjør: gcloud auth application-default login)" fi # Sync til .env i prosjektet @@ -59,13 +64,18 @@ touch "$ENV_FILE" grep -q '^GOOGLE_CLOUD_PROJECT=' "$ENV_FILE" || echo "GOOGLE_CLOUD_PROJECT=${PROJECT}" >> "$ENV_FILE" grep -q '^GOOGLE_CLOUD_LOCATION=' "$ENV_FILE" || echo "GOOGLE_CLOUD_LOCATION=${REGION}" >> "$ENV_FILE" -echo " .env : oppdatert" +echo " .env : ${GREEN}oppdatert${RESET}" echo -echo "=== Auth complete ===" +echo "=== Auth status ===" echo " Project : ${PROJECT}" echo " Region : ${REGION}" echo " Account : ${ACCOUNT}" +if [ "$ADC_OK" -eq 1 ]; then + echo " Status : ${GREEN}GRØNN${RESET} (gcloud + ADC på plass)" +else + echo " Status : ${YELLOW}GUL${RESET} (gcloud OK, men ADC mangler)" +fi echo read -r -p "[OSVauco] Starte Gemini-CLI nå med oppstartsrapport? (y/N): " ANSWER