gn-guile: Replace envvars configs with CLI-argument configs

Remove the environment variable configs that are no longer used by the
service, having moved to use of configuration files and command-line
arguments to set up the service configurations.

1 files changed, 11 insertions, 6 deletions

diff --git a/genenetwork/services/genenetwork.scm b/genenetwork/services/genenetwork.scm
index 15999a2..f880571 100644
--- a/genenetwork/services/genenetwork.scm
+++ b/genenetwork/services/genenetwork.scm
@@ -678,7 +678,7 @@ a @code{<genenetwork-configuration>} record."
                                                (allow-collisions? #t)))
                   (ssl-cert-dir (string-append gn-guile-profile "/etc/ssl/certs"))
                   (ssl-cert-file (string-append ssl-cert-dir "/ca-certificates.crt"))
-                  (current-repo-path (string-append (pk "CWD" (getcwd)) "/gn-docs"))
+                  (gn-docs-local-checkout (string-append (pk "CWD" (getcwd)) "/gn-docs"))
                   (ssh-command #$(file-append openssh-sans-x "/bin/ssh"))
                   (ssh-config-file #$(mixed-text-file "gn-guile-ssh-config"
                                                       "Host git.genenetwork.org\n"
@@ -695,15 +695,20 @@ a @code{<genenetwork-configuration>} record."
                                                           ssh-config-file)))
              (setenv "GIT_COMMITTER_NAME" "genenetwork")
              (setenv "GIT_COMMITTER_EMAIL" "no-reply@git.genenetwork.org")
-             (setenv "CURRENT_REPO_PATH" current-repo-path)
-             (setenv "CGIT_REPO_PATH" #$gn-doc-remote-uri)
 
-             (when (file-exists? current-repo-path)
-               (delete-file-recursively current-repo-path))
+             (when (file-exists? gn-docs-local-checkout)
+               (delete-file-recursively gn-docs-local-checkout))
              (invoke #$(file-append git-minimal "/bin/git")
                      "clone" "--depth" "1" "--branch" #$gn-docs-working-branch #$gn-doc-remote-uri))
            (invoke #$(file-append gn-guile "/bin/gn-guile")
-                   (number->string #$gn-guile-port)))))))
+                   "--port"
+                   (number->string #$gn-guile-port)
+                   "--gn-docs-local-checkout"
+                   (string-append (getcwd) "/gn-docs")
+                   "--gn-docs-remote-url"
+                   #$gn-doc-remote-uri
+                   "--gn-docs-working-branch"
+                   #$gn-docs-working-branch))))))
 
 (define (gn-guile-shepherd-service config program-gexp)
   (match-record config <genenetwork-configuration>