defuck environment variables mess

bolt.rkt

@@ -56,7 +56,7 @@
 (define (as-user cmd)
   (if
    (user)
-     (format "sudo -u ~a sh -c \"~a\""
+     (format "sudo -u ~a sh -c '~a'"
              (user)
              cmd)
    cmd))
@@ -67,11 +67,11 @@
   (match
       (ssh (host)
        (as-user
-        (string-append
+         (format "cd ~a && ~a ~a"
-         (format "cd ~a && ~a; "
                  (cwd)
-                 (format-vars))
+                 (format-vars)
-         cmd))
+                 cmd)
+         )
        #:failure-log "/tmp/test.log"
        #:mode 'output)
     [(cons code output)

shell_env.rkt

@@ -40,7 +40,7 @@
     (hash-map
       (shell-env)
       (lambda (k v)
-        (format "~a=~a" k v)))))
+        (format "export ~a=~a;" k v)))))
 
 (define-syntax join-shell-vars
   (syntax-rules ()