Better handling of user interrupts (#299)

garnix-io · Nov 3, 2023 · 53fe9e3 · 53fe9e3
1 parent 3c4852f
commit 53fe9e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+*.cabal linguist-generated
+/examples/init/foo.cabal -linguist-generated
diff --git a/cabal.project b/cabal.project
@@ -1 +1,2 @@
 packages: garn.cabal
+tests: True
diff --git a/src/Garn.hs b/src/Garn.hs
@@ -6,7 +6,7 @@ module Garn
   )
 where
 
-import Control.Exception (catch)
+import Control.Exception (catch, throwIO)
 import Control.Monad (forM_, when)
 import Development.Shake (Exit (Exit), cmd)
 import Garn.Common (currentSystem, nixArgs)
@@ -48,7 +48,7 @@ runWith env (WithGarnTsOpts garnConfig opts) = do
   case opts of
     Gen -> pure ()
     Run (CommandOptions {..}) argv -> do
-      callProcess "nix" $ ["run"] <> nixArgs <> [".#" <> asNixFacing target, "--"] <> argv
+      rawSystem "nix" (["run"] <> nixArgs <> [".#" <> asNixFacing target, "--"] <> argv) >>= throwIO
     Enter (CommandOptions {..}) -> do
       hPutStrLn stderr $
         "[garn] Entering "
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		*.cabal linguist-generated
		/examples/init/foo.cabal -linguist-generated