From b7091a66d74e8379d5cfd3e2e26aa072e351764e Mon Sep 17 00:00:00 2001 From: Wesley Kerfoot Date: Sat, 28 Apr 2018 00:47:47 -0400 Subject: [PATCH] format shell vars, fix bug --- bolt.rkt | 3 ++- shell_env.rkt | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bolt.rkt b/bolt.rkt index 5bb517e..52783b3 100755 --- a/bolt.rkt +++ b/bolt.rkt @@ -2,6 +2,7 @@ (require remote-shell/ssh) (require "directory.rkt") +(require "shell_env.rkt") (define (strip-first-line st) (string-join @@ -101,4 +102,4 @@ (define pwd (make-cmd "pwd")) (provide - (all-defined-out) remote compress) + (all-defined-out) remote compress shell-env set-vars format-vars) diff --git a/shell_env.rkt b/shell_env.rkt index a4ec5c2..4de2162 100644 --- a/shell_env.rkt +++ b/shell_env.rkt @@ -8,7 +8,7 @@ (define h2-vs (hash->list h2)) (make-hash (append h1-vs h2-vs))) -(define (merge-hashes . hs ...) +(define (merge-hashes . hs) (foldl merge-hash #hash() hs)) (define (set-vars vars) @@ -17,3 +17,16 @@ (list (shell-env) (make-hash vars)))) + +(define (format-vars) + (string-join + (hash-map + (shell-env) + (lambda (k v) + (format "~a=~a" k v))))) + +(provide + shell-env + merge-hashes + set-vars + format-vars)