feat: factorize shell scripts so that they can be composed more freely (

#40)
nix-community · Jul 26, 2022 · dd3c333 · dd3c333
1 parent c893573
commit dd3c333
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -4,4 +4,5 @@
   make = import ./make.nix { inherit pkgs lib; };
   makeAll = import ./make_all.nix { inherit pkgs lib; };
   makeHook = import ./hooks { inherit pkgs lib; };
+  commonHook = import ./hooks/common.nix;
 }
diff --git a/lib/hooks/default.nix b/lib/hooks/default.nix
@@ -11,12 +11,15 @@ let
   # Use writeShellScript for integrated error checking
   shellScript = pkgs.writeShellScript "nixago_${name}_hook" hook;
 in
-''
-  # Common shell code
-  ${common}
-
-  # Enable tracing if NIXAGO_TRACE==1
-  run_if_trace set -x
-  source ${shellScript}
-  run_if_trace set +x
-''
+{
+  inherit shellScript;
+  shellHook = ''
+    # Common shell code
+    ${common}
+  
+    # Enable tracing if NIXAGO_TRACE==1
+    run_if_trace set -x
+    source ${shellScript}
+    run_if_trace set +x
+  '';
+}
diff --git a/lib/make.nix b/lib/make.nix
@@ -40,9 +40,8 @@ let
   };
 
   # Builds the shell hook for managing the generated file.
-  shellHook =
-    lib.makeHook { inherit configFile name hookConfig; };
+  inherit (lib.makeHook { inherit configFile name hookConfig; }) shellHook shellScript;
 in
 {
-  inherit configFile shellHook;
+  inherit configFile shellHook shellScript;
 }
diff --git a/lib/make_all.nix b/lib/make_all.nix
@@ -8,12 +8,11 @@ let
 
   # Only include common shell code once
   common = (import ./hooks/common.nix);
-  shellHook = common + "\n" +
-    builtins.replaceStrings [ common ] [ "" ]
-      (concatStringsSep "\n"
-        (pkgs.lib.catAttrs "shellHook" result));
+  shellHook = common + "\nsource " +
+    (concatStringsSep "\nsource " (catAttrs "shellScript" result));
 in
 {
   inherit shellHook;
+  scripts = catAttrs "shellScript" result;
   configs = catAttrs "configFile" result;
 }