From 77f6bd16134c34d3ee99235b15e15919f00ddc89 Mon Sep 17 00:00:00 2001 From: niten Date: Tue, 21 Mar 2023 08:40:54 -0700 Subject: [PATCH] Fix executable name. And print out missing params more neatly. --- flake.nix | 3 +++ module.nix | 2 +- src/suanni/server/cli.clj | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 7f09589..7fcd9dc 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,9 @@ buildInputs = with helpers.packages."${system}"; [ updateClojureDeps ]; }; + suanniServer = pkgs.mkShell { + buildInputs = with self.packages."${system}"; [ suanni-server ]; + }; }; }) // { nixosModules = rec { diff --git a/module.nix b/module.nix index 611dead..93962f0 100644 --- a/module.nix +++ b/module.nix @@ -103,7 +103,7 @@ in { ]; ExecStart = pkgs.writeShellScript "suanni-server.sh" (concatStringsSep " " ([ - "suanni-server" + "suanni.server" "--hostname=${cfg.event-listener.hostname}" "--port=${toString cfg.event-listener.port}" "--synology-host=${cfg.synology-client.host}" diff --git a/src/suanni/server/cli.clj b/src/suanni/server/cli.clj index 7418e07..803d475 100644 --- a/src/suanni/server/cli.clj +++ b/src/suanni/server/cli.clj @@ -50,7 +50,7 @@ (defn- parse-opts [args required cli-opts] (let [{:keys [options]} :as result (cli/parse-opts args cli-opts) missing (set/difference required (-> options (keys) (set))) - missing-errors (map #(format "missing required parameter: %s" %) + missing-errors (map #(format "missing required parameter: %s" (name %)) missing)] (update result :errors concat missing-errors)))