Fix env var

mmena1 · Mar 14, 2024 · 0b6f081 · 0b6f081
1 parent ef4a30f
commit 0b6f081
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,14 +1,12 @@
 name: Chezmoi Setup Validation
 
-on:
-  push:
-    branches:
-      - '*'
+on: push
+env:
+  dev: false
 
 jobs:
   validate-chezmoi-setup:
     runs-on: ubuntu-latest
-    environment: CI
     steps:
       - name: Extract branch name
         shell: bash

diff --git a/home/.chezmoi.toml.tmpl b/home/.chezmoi.toml.tmpl
@@ -1,5 +1,5 @@
 {{- $email := "example@email.com" -}}
-{{- if eq (env "ENVIRONMENT") "dev" -}}
+{{- if env "dev" -}}
 {{-   $email = promptStringOnce . "email" "Email address" -}}
 {{- end -}}
 {{- $osid := .chezmoi.os -}}
@@ -11,4 +11,4 @@
 [data]
     email = {{ $email | quote }}
     osid = {{ $osid | quote }}
-    environment = {{ env "ENVIRONMENT" | default "dev" | quote }}
+    dev = {{ env "dev" | default true }}
diff --git a/home/.chezmoiscripts/run_before_00-intro.sh.tmpl b/home/.chezmoiscripts/run_before_00-intro.sh.tmpl
@@ -1,4 +1,4 @@
-{{ if eq .environment "dev" -}}
+{{ if .dev -}}
 {{ template "common" . -}}
 {{ template "dotfile" }}
 

diff --git a/home/.chezmoiscripts/run_once_after_04-ssh-keys.sh.tmpl b/home/.chezmoiscripts/run_once_after_04-ssh-keys.sh.tmpl
@@ -1,4 +1,4 @@
-{{ if eq .environment "dev" -}}
+{{ if .dev -}}
 {{ template "common" . -}}
 
 set_ssh_keys() {

diff --git a/home/.chezmoitemplates/common b/home/.chezmoitemplates/common
@@ -40,9 +40,9 @@ function error() {
   echo -e "$COL_RED[error]$COL_RESET "$1
 }
 
-function prompt() {
-  {{ if eq .environment "dev" -}}
-  read -rp $1" [y/N]" -n 1 -r -s answer
+function prompt {
+  {{ if .dev -}}
+  read -rp "$1 [y/N]" -n 1 -r -s answer
   {{ else -}}
   answer="y"
   {{ end -}}