Overview
| Comment: | eval-string-in-environment if was disabled, re-enabled From: 9564772564650055d045983029236da1cf850ca7 User: matt |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65-real-reenable-eval-if |
| Files: | files | file ages | folders |
| SHA1: |
cc82a076230c4b81e99945ff2fb4a70c |
| User & Date: | matt on 2021-02-25 23:22:50 |
| Other Links: | branch diff | manifest | tags |
Context
|
2021-02-25
| ||
| 23:25 |
Merged diet branch
From: 84be6d275afcef4ec123f4afd946b77ff0440ce3 User: matt check-in: 87669bb7f8 user: matt tags: v1.65-real-reenable-eval-if (unpublished) | |
| 23:22 | eval-string-in-environment if was disabled, re-enabled From: 9564772564650055d045983029236da1cf850ca7 User: matt check-in: cc82a07623 user: matt tags: v1.65-real-reenable-eval-if (unpublished) | |
| 15:46 | Missing dep. check-in: 80a01976f7 user: matt tags: v1.65-real | |
Changes
Modified configf.scm from [15f0835800] to [239244f9ed].
| ︙ | ︙ | |||
56 57 58 59 60 61 62 | (define (configf:section-var-set! cfgdat section-name var value #!key (metadata #f)) (hash-table-set! cfgdat section-name (configf:assoc-safe-add (hash-table-ref/default cfgdat section-name '()) var value metadata: metadata))) | | | | | | | | | | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 |
(define (configf:section-var-set! cfgdat section-name var value #!key (metadata #f))
(hash-table-set! cfgdat section-name
(configf:assoc-safe-add
(hash-table-ref/default cfgdat section-name '())
var value metadata: metadata)))
;; The if was disabled, but why?
(if (or (string-null? str)
(equal? "!" (substring str 0 1))) ;; null string or starts with ! are preserved but NOT set in the environment
str
(handle-exceptions
exn
(begin
(debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment, exn=" exn)
#f)
(let ((cmdres (process:cmd-run->list (conc "echo " str))))
(if (null? cmdres) ""
(caar cmdres))))))
;;======================================================================
;; Make the regexp's needed globally available
;;======================================================================
(define configf:include-rx (regexp "^\\[include\\s+(.*)\\]\\s*$"))
(define configf:script-rx (regexp "^\\[scriptinc\\s+(\\S+)([^\\]]*)\\]\\s*$")) ;; include output from a script
|
| ︙ | ︙ |