diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-17 20:16:48 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-17 20:16:48 +0200 |
commit | 41d4efda03af2cf6244ccfb3fb57fba5f664bb50 (patch) | |
tree | f7ce24814672b2ccff87125154fe648e99115925 | |
parent | Fix global version var. (diff) | |
download | calp-41d4efda03af2cf6244ccfb3fb57fba5f664bb50.tar.gz calp-41d4efda03af2cf6244ccfb3fb57fba5f664bb50.tar.xz |
Hopefully repaired --update-zoneinfo.-
Diffstat (limited to '')
-rwxr-xr-x | env | 5 | ||||
-rw-r--r-- | module/calp/main.scm | 7 | ||||
-rw-r--r-- | module/directories.scm | 5 | ||||
-rwxr-xr-x | scripts/tzget (renamed from tzget) | 0 |
4 files changed, 11 insertions, 6 deletions
@@ -6,7 +6,10 @@ GUILE_LOAD_PATH="$root/module:$GUILE_LOAD_PATH" #GUILE_LOAD_COMPILED_PATH="$root/obj/module:$GUILE_LOAD_COMPILED_PATH" #LD_LIBRARY_PATH="$root/lib:$LD_LIBRARY_PATH" -export GUILE_LOAD_PATH GUILE_LOAD_COMPILED_PATH LD_LIBRARY_PATH +XDG_DATA_HOME=$root +LIBEXEC=$root/scripts/ + +export GUILE_LOAD_PATH GUILE_LOAD_COMPILED_PATH LD_LIBRARY_PATH XDG_DATA_HOME LIBEXEC #export GUILE_AUTO_COMPILE=0 # exec "$@" diff --git a/module/calp/main.scm b/module/calp/main.scm index ee49c250..709658d8 100644 --- a/module/calp/main.scm +++ b/module/calp/main.scm @@ -165,15 +165,16 @@ (open-input-pipe (path-append libexec "/tzget"))))) ;; (define path (read-line pipe)) - (define names (string-split ((@ (ice-9 rdelim) read-line) pipe) #\space)) + (define line ((@ (ice-9 rdelim) read-line) pipe)) + (define names (string-split line #\space)) ((@ (util io) with-atomic-output-to-file) (path-append data-directory "/zoneinfo.scm") (lambda () (write `(set-config! 'tz-list ',names)) (newline) - (write `(set-config! 'last-zoneinfo-upgrade ,((@ (datetime) current-date))) (newline)))))) + (write `(set-config! 'last-zoneinfo-upgrade ,((@ (datetime) current-date)))) (newline))))) ;; always load zoneinfo if available. - (let ((z (path-append data-directory "/zoneinfo"))) + (let ((z (path-append data-directory "/zoneinfo.scm"))) (when (file-exists? z) (primitive-load z))) diff --git a/module/directories.scm b/module/directories.scm index fe86bdf6..8e46d8b6 100644 --- a/module/directories.scm +++ b/module/directories.scm @@ -22,8 +22,9 @@ "/calp")) (define (libexec%) - (path-append (get-config 'path-prefix) - "/lib/calp")) + (or (getenv "LIBEXEC") + (path-append (get-config 'path-prefix) + "/lib/calp"))) (define-syntax libexec (identifier-syntax (libexec%))) (export libexec) |