run gen-cabal after git-adding flake.* in bootstrap

lib/with-config.nix

@@ -94,32 +94,34 @@ let
   chmod +x $exe
   '';
 
-  bootstrapWithStaticCli = name: script: pkgs.writeScript name ''
+  bootstrapWithStaticCli = name: pre: post: pkgs.writeScript name ''
   #!${pkgs.bashInteractive}/bin/bash
   set -e
   ${downloadStaticCli}
-  ${script}
+  ${pre}
   if ! git status &>/dev/null
   then
     ${pkgs.git}/bin/git init
   fi
   ${pkgs.git}/bin/git add .
   ${pkgs.nix}/bin/nix flake update
   ${pkgs.git}/bin/git add flake.lock
+  ${post}
   '';
 
-  bootstrapWithDynamicCli = name: script: pkgs.writeScript name ''
+  bootstrapWithDynamicCli = name: pre: post: pkgs.writeScript name ''
   #!${pkgs.bashInteractive}/bin/bash
   set -e
   exe="${config.outputs.packages.hix}/bin/hix"
-  ${script}
+  ${pre}
   if ! git status &>/dev/null
   then
     ${pkgs.git}/bin/git init
   fi
   ${pkgs.git}/bin/git add .
   ${pkgs.nix}/bin/nix flake update
   ${pkgs.git}/bin/git add flake.lock
+  ${post}
   '';
 
   cacheWrapper = self: name: app: pkgs.writeScript name ''

local.nix

@@ -109,6 +109,7 @@ hix.pro [({config, lib, ...}: {
       new-nocache = let
         prog = util.bootstrapWithDynamicCli "hix-new-nocache" ''
         $exe new --hix-url '${config.internal.hixUrl}' "$@"
+        '' ''
         nix run .#gen-cabal
         '';
       in {
@@ -126,6 +127,7 @@ hix.pro [({config, lib, ...}: {
       bootstrap-nocache = let
         prog = util.bootstrapWithDynamicCli "hix-bootstrap-nocache" ''
         $exe bootstrap --hix-url '${config.internal.hixUrl}' "$@"
+        '' ''
         nix run .#gen-cabal
         '';
       in {

test/bootstrap/test.nix

@@ -1,8 +1,9 @@
-{ pkgs }:
+{...}:
 {
   test = builtins.toFile "bootstrap-test" ''
     cd ./root
-    check_match 'nix run path:$hix_dir#bootstrap' 'Initialized' "Bootstrap command didn't initialize git repo"
+    git init
+    check_match 'nix run path:$hix_dir#bootstrap' 'generated red-panda-core' "Bootstrap command didn't generate cabal files"
     check_match 'nix run .#ghci -- -p red-panda -t main <<< :quit' 'success' 'Running tests in generated project failed'
   '';
 }