From 905248dcb80e56903a0a8cbe13f8966a4b940330 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 26 Jan 2020 22:50:52 +0100
Subject: pkgs/profpatsch/write-execline: add all argparsing commands

In some cases (especially with `runblock`), the arguments need to be
accessible as environment variables, so we need a way to pass that to
execline.
---
 pkgs/profpatsch/execline/write-execline.nix | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'pkgs/profpatsch/execline')

diff --git a/pkgs/profpatsch/execline/write-execline.nix b/pkgs/profpatsch/execline/write-execline.nix
index f83aa2ed..23c96454 100644
--- a/pkgs/profpatsch/execline/write-execline.nix
+++ b/pkgs/profpatsch/execline/write-execline.nix
@@ -5,8 +5,26 @@ let
   # Write a list of execline argv parameters to an execline script.
   # Everything is escaped correctly.
   # TODO upstream into nixpkgs
-  writeExeclineCommon = writer: name: { readNArgs ? 0 }: argList: writer name ''
-    #!${pkgs.execline}/bin/execlineb -Ws${toString readNArgs}
+  writeExeclineCommon = writer: name: {
+     # "var": substitute readNArgs variables and start $@ from the (readNArgs+1)th argument
+     # "var-full": substitute readNArgs variables and start $@ from $0
+     # "env": don’t substitute, set # and 0…n environment vaariables, where n=$#
+     # "none": don’t substitute or set any positional arguments
+     # "env-no-push": like "env", but bypass the push-phase. Not recommended.
+     argMode ? "var",
+     # Number of arguments to be substituted as variables (passed to "var"/"-s" or "var-full"/"-S"
+     readNArgs ? 0,
+  }: argList:
+   let
+     env =
+       if      argMode == "var" then "s${toString readNArgs}"
+       else if argMode == "var-full" then "S${toString readNArgs}"
+       else if argMode == "env" then ""
+       else if argMode == "none" then "P"
+       else if argMode == "env-no-push" then "p"
+       else abort ''"${toString argMode}" is not a valid argMode, use one of "var", "var-full", "env", "none", "env-no-push".'';
+   in writer name ''
+    #!${pkgs.execline}/bin/execlineb -W${env}
     ${escape.escapeExecline argList}
   '';
   writeExecline = writeExeclineCommon pkgs.writeScript;
-- 
cgit 1.4.1