~ salmonella-environment-setup (master) 64b19667ae35754fb1bbb9885fb097adca0a50ff


commit 64b19667ae35754fb1bbb9885fb097adca0a50ff
Author:     Mario Domenech Goulart <mario@parenteses.org>
AuthorDate: Sun Nov 22 10:01:46 2020 +0100
Commit:     Mario Domenech Goulart <mario@parenteses.org>
CommitDate: Sun Nov 22 10:01:46 2020 +0100

    awful config: support CHICKEN 5

diff --git a/awful/awful-salmonella-tar.conf b/awful/awful-salmonella-tar.conf
index c726b57..5b15bbe 100644
--- a/awful/awful-salmonella-tar.conf
+++ b/awful/awful-salmonella-tar.conf
@@ -1,5 +1,14 @@
 ;; -*- scheme -*-
-(use spiffy spiffy-sexpr-log awful awful-salmonella-tar intarweb)
+(import scheme)
+(cond-expand
+  (chicken-4
+   (import chicken)
+   (use awful awful-salmonella-tar intarweb spiffy spiffy-sexpr-log))
+  (chicken-5
+   (import (chicken pathname))
+   (import awful awful-salmonella-tar intarweb spiffy spiffy-sexpr-log))
+  (else
+   (error "Unsupported CHICKEN version.")))
 
 (root-path "/home/chicken/salmonella/reports")
 (split-log? #t)
diff --git a/awful/awful.conf b/awful/awful.conf
index 9c37406..ce2c03b 100644
--- a/awful/awful.conf
+++ b/awful/awful.conf
@@ -1,5 +1,16 @@
 ;; -*- scheme -*-
-(use spiffy spiffy-sexpr-log spiffy-directory-listing html-tags html-utils intarweb awful)
+(import scheme)
+(cond-expand
+  (chicken-4
+   (import chicken)
+   (use awful html-tags html-utils intarweb
+        spiffy spiffy-sexpr-log spiffy-directory-listing))
+  (chicken-5
+   (import (chicken pathname))
+   (import awful html-tags html-utils intarweb
+           spiffy spiffy-sexpr-log spiffy-directory-listing))
+  (else
+   (error "Unsupported CHICKEN version.")))
 
 (root-path "/home/chicken/salmonella/reports")
 (split-log? #t)
diff --git a/awful/privileged.conf b/awful/privileged.conf
index 0be2898..0566aaa 100644
--- a/awful/privileged.conf
+++ b/awful/privileged.conf
@@ -1,4 +1,13 @@
-(use spiffy awful)
+;; -*- scheme -*-
+(import scheme)
+(cond-expand
+  (chicken-4
+   (import chicken)
+   (use spiffy awful))
+  (chicken-5
+   (import spiffy awful))
+  (else
+   (error "Unsupported CHICKEN version.")))
 
 (server-port 80)
 (spiffy-user "awful")
Trap