From 3416a45b54e092c6b9b24738aa44d3c217982c26 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 20:32:46 +0200
Subject: withGetopt: pass "$@" to command

---
 krebs/5pkgs/simple/withGetopt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix
index fd59adcaf..21322b783 100644
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@@ -102,5 +102,5 @@ in writeDash wrapper-name ''
     export ${opt.varname}
   '') opts)}
 
-  ${cmd-script}
+  ${cmd-script} "$@"
 ''
-- 
cgit v1.2.3


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/5pkgs')

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


From ab7e0c879cc0657ea7e25eb95ab89473f38c5507 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 20:51:07 +0200
Subject: withGetopt: sort getopt arguments

---
 krebs/5pkgs/simple/withGetopt.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix
index b7bd40126..7a19ccd29 100644
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@@ -38,18 +38,31 @@ in writeDash wrapper-name ''
 
   wrapper_name=${shell.escape wrapper-name}
 
+  # TODO
+  for i in "$@"; do
+    case $i in
+      -h|--help)
+        ${concatStringsSep "\n" (mapAttrsToList (name: opt: /* sh */ ''
+          printf '  %-16s  %s\n' \
+              --${shell.escape opt.long} \
+              ${shell.escape (opt.description or "undocumented flag")}
+        '') opts)}
+        exit
+    esac
+  done
+
   ${concatStringsSep "\n" (mapAttrsToList (name: opt: /* sh */ ''
     unset ${opt.varname}
   '') opts)}
 
   args=$(${utillinux}/bin/getopt \
-      -n "$wrapper_name" \
-      -o "" \
       -l ${shell.escape
             (concatMapStringsSep ","
               (opt: opt.long + optionalString (!opt.switch) ":")
               (filter (opt: opt.long != null)
                       (attrValues opts)))} \
+      -n "$wrapper_name" \
+      -o "" \
       -s sh \
       -- "$@")
   if \test $? != 0; then exit 1; fi
-- 
cgit v1.2.3


From 16e6046544378bd5cdac73a9099b1d9d22a712cb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 19 Sep 2017 20:59:08 +0200
Subject: withGetopt: support short options

---
 krebs/5pkgs/simple/withGetopt.nix | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/simple/withGetopt.nix b/krebs/5pkgs/simple/withGetopt.nix
index 7a19ccd29..196e6765a 100644
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@@ -13,6 +13,7 @@ opt-spec: cmd-spec: let
   opts = mapAttrs (name: value: value // rec {
     long = value.long or (replaceStrings ["_"] ["-"] name);
     ref = value.ref or "\"\$${varname}\"";
+    short = value.short or null;
     switch = value.switch or false;
     varname = value.varname or (replaceStrings ["-"] ["_"] name);
   }) opt-spec;
@@ -38,19 +39,6 @@ in writeDash wrapper-name ''
 
   wrapper_name=${shell.escape wrapper-name}
 
-  # TODO
-  for i in "$@"; do
-    case $i in
-      -h|--help)
-        ${concatStringsSep "\n" (mapAttrsToList (name: opt: /* sh */ ''
-          printf '  %-16s  %s\n' \
-              --${shell.escape opt.long} \
-              ${shell.escape (opt.description or "undocumented flag")}
-        '') opts)}
-        exit
-    esac
-  done
-
   ${concatStringsSep "\n" (mapAttrsToList (name: opt: /* sh */ ''
     unset ${opt.varname}
   '') opts)}
@@ -62,7 +50,11 @@ in writeDash wrapper-name ''
               (filter (opt: opt.long != null)
                       (attrValues opts)))} \
       -n "$wrapper_name" \
-      -o "" \
+      -o ${shell.escape
+            (concatMapStringsSep ""
+              (opt: opt.short + optionalString (!opt.switch) ":")
+              (filter (opt: opt.short != null)
+                      (attrValues opts)))} \
       -s sh \
       -- "$@")
   if \test $? != 0; then exit 1; fi
@@ -71,7 +63,10 @@ in writeDash wrapper-name ''
   while :; do
     case $1 in
     ${concatStringsSep "\n" (mapAttrsToList (name: opt: /* sh */ ''
-      --${opt.long})
+      (${concatMapStringsSep "|" shell.escape (filter (x: x != "") [
+        (optionalString (opt.long != null) "--${opt.long}")
+        (optionalString (opt.short != null) "-${opt.short}")
+      ])})
         ${if opt.switch then /* sh */ ''
           ${opt.varname}=true
           shift
@@ -81,7 +76,7 @@ in writeDash wrapper-name ''
         ''}
       ;;
     '') (filterAttrs
-          (_: opt: opt.long != null)
+          (_: opt: opt.long != null || opt.short != null)
           opts))}
     --)
       shift
-- 
cgit v1.2.3