fix: finally write default values

src/common/bootstrap.ts

@@ -77,7 +77,6 @@ export const bootstrapGit = async (inValues?: Record<string, any>): Promise<void
     }
     // we know we have commits, so we replace ENV_DIR with the clone files and overwrite with new values
     // so first get the new values without secrets (as those exist already)
-    // const newValues = (await hfValues({ filesOnly: true })) as Record<string, any>
     cd(env.ENV_DIR)
     // then sync the clone back to ENV_DIR
     const flags = '-rl' // recursive, preserve symlinks and groups (all we can do without superuser privs)
@@ -87,22 +86,31 @@ export const bootstrapGit = async (inValues?: Record<string, any>): Promise<void
   } catch (e) {
     d.debug(e)
     d.info('Remote does not exist yet. Expecting first commit to come later.')
+  } finally {
+    // finally write back the new values without overwriting existing values
+    d.info('Write default values to env repo')
+    await writeValues(values)
   }
-  // finally write back the new values without overwriting existing values
-  d.info('Write default values to env repo')
-  await writeValues(values)
+
   if (!(await pathExists(`${env.ENV_DIR}/.git`))) {
     d.info('Initializing values git repo.')
     await $`git init .`
   }
-  if (isCli) await copyFile(`${rootDir}/bin/hooks/pre-commit`, `${env.ENV_DIR}/.git/hooks/pre-commit`)
-  else await nothrow($`git config --global --add safe.directory ${env.ENV_DIR}`)
+
+  if (isCli) {
+    await copyFile(`${rootDir}/bin/hooks/pre-commit`, `${env.ENV_DIR}/.git/hooks/pre-commit`)
+  } else {
+    await nothrow($`git config --global --add safe.directory ${env.ENV_DIR}`)
+  }
+
   await setIdentity(username, password, email)
+
   if (!hasCommits) {
     await nothrow($`git checkout -b ${branch}`)
     await nothrow($`git remote add origin ${remote}`)
   }
-  if (await pathExists(`${env.ENV_DIR}/.sops.yaml`))
+  if (await pathExists(`${env.ENV_DIR}/.sops.yaml`)) {
     await nothrow($`git config --local diff.sopsdiffer.textconv "sops -d"`)
+  }
   d.log(`Done bootstrapping git`)
 }