From 9f85824da25311ec096d748798f49d09519e16aa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 20:50:00 +0200
Subject: withGetopt: make long option optional

---
 krebs/5pkgs/simple/withGetopt.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'krebs')

diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix
index 21322b783..b7bd40126 100644
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@@ -45,9 +45,11 @@ in writeDash wrapper-name ''
   args=$(${utillinux}/bin/getopt \
       -n "$wrapper_name" \
       -o "" \
-      -l ${concatMapStringsSep ","
-            (opt: opt.long + optionalString (!opt.switch) ":")
-            (attrValues opts)} \
+      -l ${shell.escape
+            (concatMapStringsSep ","
+              (opt: opt.long + optionalString (!opt.switch) ":")
+              (filter (opt: opt.long != null)
+                      (attrValues opts)))} \
       -s sh \
       -- "$@")
   if \test $? != 0; then exit 1; fi
@@ -65,7 +67,9 @@ in writeDash wrapper-name ''
           shift 2
         ''}
       ;;
-    '') opts)}
+    '') (filterAttrs
+          (_: opt: opt.long != null)
+          opts))}
     --)
       shift
       break
-- 
cgit v1.2.3