Add green/yellow status styling and clearer layout to OSVauco startup and OPAX boot scripts
This commit is contained in:
parent
18a9f93c37
commit
70e7dc3615
|
|
@ -1,5 +1,5 @@
|
||||||
#!/usr/bin/env bash
|
#!/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
|
set -euo pipefail
|
||||||
|
|
||||||
|
|
@ -14,6 +14,7 @@ LOG_FILE="$HOME/OSVauco/docs/OSVAUCO_OPAX_SESSION_LOG.md"
|
||||||
|
|
||||||
GREEN="$(tput setaf 2 || true)"
|
GREEN="$(tput setaf 2 || true)"
|
||||||
RED="$(tput setaf 1 || true)"
|
RED="$(tput setaf 1 || true)"
|
||||||
|
YELLOW="$(tput setaf 3 || true)"
|
||||||
RESET="$(tput sgr0 || true)"
|
RESET="$(tput sgr0 || true)"
|
||||||
|
|
||||||
SESSION_ID="$(date '+%Y%m%d-%H%M%S')"
|
SESSION_ID="$(date '+%Y%m%d-%H%M%S')"
|
||||||
|
|
@ -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)"
|
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 "$SESSION_ID | $PROJECT_ID | $REGION | $ACCOUNT | $SESSION_DESC" >> "$LOG_FILE"
|
||||||
echo " Logg oppdatert: $LOG_FILE"
|
echo " Logg : ${GREEN}oppdatert${RESET} → $LOG_FILE"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
read -r -p "[OSVauco/OPAX] Starte Gemini-CLI i ~/OSVauco nå? (y/N): " ANSWER
|
read -r -p "[OSVauco/OPAX] Starte Gemini-CLI i ~/OSVauco nå? (y/N): " ANSWER
|
||||||
|
|
|
||||||
|
|
@ -3,11 +3,16 @@
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
GREEN="$(tput setaf 2 || true)"
|
||||||
|
RED="$(tput setaf 1 || true)"
|
||||||
|
YELLOW="$(tput setaf 3 || true)"
|
||||||
|
RESET="$(tput sgr0 || true)"
|
||||||
|
|
||||||
clear
|
clear
|
||||||
|
|
||||||
# Guard: stopp hvis gcloud auth er utløpt
|
# Guard: stopp hvis gcloud auth er utløpt
|
||||||
if ! gcloud auth print-access-token >/dev/null 2>&1; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
@ -47,9 +52,9 @@ fi
|
||||||
|
|
||||||
echo
|
echo
|
||||||
if [ "$ADC_OK" -eq 1 ]; then
|
if [ "$ADC_OK" -eq 1 ]; then
|
||||||
echo " ADC : OK"
|
echo " ADC : ${GREEN}OK${RESET}"
|
||||||
else
|
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
|
fi
|
||||||
|
|
||||||
# Sync til .env i prosjektet
|
# 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_PROJECT=' "$ENV_FILE" || echo "GOOGLE_CLOUD_PROJECT=${PROJECT}" >> "$ENV_FILE"
|
||||||
grep -q '^GOOGLE_CLOUD_LOCATION=' "$ENV_FILE" || echo "GOOGLE_CLOUD_LOCATION=${REGION}" >> "$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
|
||||||
|
|
||||||
echo "=== Auth complete ==="
|
echo "=== Auth status ==="
|
||||||
echo " Project : ${PROJECT}"
|
echo " Project : ${PROJECT}"
|
||||||
echo " Region : ${REGION}"
|
echo " Region : ${REGION}"
|
||||||
echo " Account : ${ACCOUNT}"
|
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
|
echo
|
||||||
|
|
||||||
read -r -p "[OSVauco] Starte Gemini-CLI nå med oppstartsrapport? (y/N): " ANSWER
|
read -r -p "[OSVauco] Starte Gemini-CLI nå med oppstartsrapport? (y/N): " ANSWER
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user