From 0fe1fba4af41f267c4bb2c006fb37f42422ab703 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 14 Nov 2018 18:11:58 +0100 Subject: daemon: Install 'authenticate' script under LIBEXECDIR/guix. That way it is handled in the same way as other helper scripts. * nix/scripts/guix-authenticate.in: Rename to... * nix/scripts/authenticate.in: ... this. * config-daemon.ac: Adjust accordingly. * nix/local.mk (libstore_a_CPPFLAGS): Remove -DOPENSSL_PATH. (nodist_libexec_SCRIPTS): Remove. (nodist_pkglibexec_SCRIPTS): New variable. * nix/nix-daemon/guix-daemon.cc (main): Remove 'setenv' call for "PATH". * nix/libstore/local-store.cc (runAuthenticationProgram): New function. (LocalStore::exportPath, LocalStore::importPath): Use it instead of 'runProgram' and OPENSSL_PATH. --- nix/scripts/authenticate.in | 11 +++++++++++ nix/scripts/guix-authenticate.in | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 nix/scripts/authenticate.in delete mode 100644 nix/scripts/guix-authenticate.in (limited to 'nix/scripts') diff --git a/nix/scripts/authenticate.in b/nix/scripts/authenticate.in new file mode 100644 index 0000000000..5ce57915f0 --- /dev/null +++ b/nix/scripts/authenticate.in @@ -0,0 +1,11 @@ +#!@SHELL@ +# A shorthand for "guix authenticate", for use by the daemon. + +if test "x$GUIX_UNINSTALLED" = "x" +then + prefix="@prefix@" + exec_prefix="@exec_prefix@" + exec "@bindir@/guix" authenticate "$@" +else + exec guix authenticate "$@" +fi diff --git a/nix/scripts/guix-authenticate.in b/nix/scripts/guix-authenticate.in deleted file mode 100644 index 5ce57915f0..0000000000 --- a/nix/scripts/guix-authenticate.in +++ /dev/null @@ -1,11 +0,0 @@ -#!@SHELL@ -# A shorthand for "guix authenticate", for use by the daemon. - -if test "x$GUIX_UNINSTALLED" = "x" -then - prefix="@prefix@" - exec_prefix="@exec_prefix@" - exec "@bindir@/guix" authenticate "$@" -else - exec guix authenticate "$@" -fi -- cgit v1.2.3