diff --git a/dev-startup.sh b/dev-startup.sh index 9d33446..7f6db6e 100755 --- a/dev-startup.sh +++ b/dev-startup.sh @@ -6,15 +6,26 @@ set -e echo "=== šŸ”„ Oppdaterer gcloud ===" sudo apt-get update -q && sudo apt-get --only-upgrade install -y -q google-cloud-cli -echo "=== šŸ”‘ Logger inn pĆ„ gcloud ===" -gcloud auth login --no-launch-browser +# --- gcloud login (kun hvis ikke allerede innlogget) --- +ACTIVE_ACCOUNT=$(gcloud auth list --filter=status:ACTIVE --format='value(account)' 2>/dev/null | head -1) +if [[ -z "$ACTIVE_ACCOUNT" ]]; then + echo "=== šŸ”‘ Logger inn pĆ„ gcloud ===" + gcloud auth login --no-launch-browser +else + echo "=== šŸ”‘ Allerede innlogget som $ACTIVE_ACCOUNT ===" +fi echo "=== āš™ļø Setter prosjekt ===" -gcloud config set project propane-will-491900-m5 +gcloud config set project propane-will-491900-m5 --quiet -echo "=== šŸ” Application Default Credentials ===" -gcloud auth application-default login --no-launch-browser -gcloud auth application-default set-quota-project propane-will-491900-m5 +# --- ADC (kun hvis ikke allerede gyldig) --- +if ! gcloud auth application-default print-access-token &>/dev/null; then + echo "=== šŸ” Application Default Credentials ===" + gcloud auth application-default login --no-launch-browser + gcloud auth application-default set-quota-project propane-will-491900-m5 +else + echo "=== šŸ” ADC allerede gyldig ===" +fi echo "=== šŸ™ Git ===" cd ~/OSVauco && git pull