guix/guix-artwork
2
0
Fork 0
mirror of git://git.savannah.gnu.org/guix/guix-artwork.git synced 2023-12-14 05:33:02 +01:00
Code Issues Releases Wiki Activity

website: Refactor GUIX_WEB_SITE_ROOT_PATH handling.

Browse source 
* website/apps/base/utils.scm (guix-url): Move the logic that
computes which root path to use from the getter to ...
(guix-root-url-path): ... the setter here.
This commit is contained in:
Florian Pelz 2019-10-31 14:52:29 +01:00 committed by Ludovic Courtès
parent e612e97679
commit 32de6f95a1
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
website/apps/base/utils.scm
View file

@ -47,11 +47,17 @@
(define guix-root-url-path
;; Path to GNU Guix site at guix.gnu.org.
(make-parameter (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")
(lambda (path)
(if (string-suffix? "/" path)
path
(string-append path "/")))))
(let ((path (cond
;; If we are trying out the website locally, use "/" as the root.
((getenv "GUIX_WEB_SITE_LOCAL") "/")
(else (or (getenv "GUIX_WEB_SITE_ROOT_PATH") "/")))))
(make-parameter
path
;; When setting guix-root-url-path, make it end in a slash.
(lambda (path)
(if (string-suffix? "/" path)
path
(string-append path "/"))))))
(define latest-guix-version
(make-parameter "1.1.0"))
@ -97,11 +103,7 @@
RETURN VALUE (string)
A URL path. For example: /software/guix/packages/icecat-XYZ/."
;; If we are trying out the website locally, use "/" as the root.
;; Otherwise use guix-root-url-path for deployment to gnu.org.
(if (getenv "GUIX_WEB_SITE_LOCAL")
(string-append "/" subpath)
(string-append (guix-root-url-path) subpath)))
(string-append (guix-root-url-path) subpath))
(define* (manual-url #:optional (subpath "")