From 61dda874aab6fe77d3d71eb4845ba3717e9c80d2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 26 Sep 2019 02:40:07 +0200
Subject: pkgs/profpatsch/runExecline: move to list

We can auto-escape execlines correctly if we model them as nix-style
lists, so we shoud certainly do so. It also helps abstraction.
---
 pkgs/profpatsch/execline/run-execline-tests.nix | 46 +++++++++++++------------
 1 file changed, 24 insertions(+), 22 deletions(-)

(limited to 'pkgs/profpatsch/execline/run-execline-tests.nix')

diff --git a/pkgs/profpatsch/execline/run-execline-tests.nix b/pkgs/profpatsch/execline/run-execline-tests.nix
index 76f18105..02894956 100644
--- a/pkgs/profpatsch/execline/run-execline-tests.nix
+++ b/pkgs/profpatsch/execline/run-execline-tests.nix
@@ -13,14 +13,14 @@ let
       preferLocalBuild = true;
       allowSubstitutes = false;
     };
-    execline = ''
-      importas -ui s scriptPath
-      importas -ui out out
-      foreground {
-        ${coreutils}/bin/mv $s $out
-      }
-      ${bin.s6-chmod} 0755 $out
-    '';
+    execline = [
+      "importas" "-ui" "s" "scriptPath"
+      "importas" "-ui" "out" "out"
+      "foreground" [
+        "${coreutils}/bin/mv" "$s" "$out"
+      ]
+      "${bin.s6-chmod}" "0755" "$out"
+    ];
    };
 
   # execline block of depth 1
@@ -43,15 +43,17 @@ let
         bin.importas "-ui" "out" "out"
         bin.s6-touch "$out"
       ];
+    preferLocalBuild = true;
+    allowSubstitutes = false;
   };
 
   # basic test that touches out
   basic = runExecline {
     name = "run-execline-test-basic";
-    execline = ''
-      importas -ui out out
-      ${bin.s6-touch} $out
-    '';
+    execline = [
+      "importas" "-ui" "out" "out"
+      "${bin.s6-touch}" "$out"
+    ];
     derivationArgs = {
       preferLocalBuild = true;
       allowSubstitutes = false;
@@ -62,12 +64,12 @@ let
   stdin = fileHasLine "foo" (runExecline {
     name = "run-execline-test-stdin";
     stdin = "foo\nbar\nfoo";
-    execline = ''
-      importas -ui out out
+    execline = [
+      "importas" "-ui" "out" "out"
       # this pipes stdout of s6-cat to $out
       # and s6-cat redirects from stdin to stdout
-      redirfd -w 1 $out ${bin.s6-cat}
-    '';
+      "redirfd" "-w" "1" "$out" bin.s6-cat
+    ];
     derivationArgs = {
       preferLocalBuild = true;
       allowSubstitutes = false;
@@ -80,12 +82,12 @@ let
       #!${bin.execlineb} -S0
       export myvar myvalue $@
     '';
-    execline = ''
-      importas -ui v myvar
-      if { ${bin.s6-test} myvalue = $v }
-        importas out out
-        ${bin.s6-touch} $out
-    '';
+    execline = [
+      "importas" "-ui" "v" "myvar"
+      "if" [ bin.s6-test "myvalue" "=" "$v" ]
+        "importas" "out" "out"
+        bin.s6-touch "$out"
+    ];
     derivationArgs = {
       preferLocalBuild = true;
       allowSubstitutes = false;
-- 
cgit 1.4.1