aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2020-08-18 23:42:52 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2020-08-18 23:42:52 +0200
commit8f9935d6878a239d6fec077aaf58289e39314c53 (patch)
tree70269af4f8677c0571ba618e88c52fc524835957 /system
parentv0.5? (diff)
downloadcalp-8f9935d6878a239d6fec077aaf58289e39314c53.tar.gz
calp-8f9935d6878a239d6fec077aaf58289e39314c53.tar.xz
Fix problems wih system stuff.
Diffstat (limited to 'system')
-rw-r--r--system/PKGBUILD13
-rw-r--r--system/config.scm9
2 files changed, 14 insertions, 8 deletions
diff --git a/system/PKGBUILD b/system/PKGBUILD
index a3109919..cf4c23e9 100644
--- a/system/PKGBUILD
+++ b/system/PKGBUILD
@@ -1,21 +1,22 @@
pkgname=calp
pkgver=0.5
pkgrel=1
-pkgdesc=Calendar program
+pkgdesc='Calendar program'
arch=('any')
url=https://git.hornquist.se/git/calp
license=('AGPL')
depends=('guile>=2.2')
makedepends=('ruby-sass')
-optdepends=('vdirsyncer': 'Download calendar files')
+optdepends=('vdirsyncer: Download calendar files')
source=(
calp.service
config.scm
"https://github.com/HugoNikanor/$pkgname/archive/v$pkgver.tar.gz"
)
+md5sums=('SKIP' 'SKIP' 'SKIP')
build() {
- make
+ make -C $pkgname-$pkgver
}
# check() {
@@ -23,8 +24,8 @@ build() {
# }
package() {
- make DESTDIR="$pkgdir" install
- install -m 644 -D -t $pkgdir/usr/lib/systemd/system calp.service
- install -m 644 -D -t $pkgdir/etc/calp/config.scm config.scm
+ make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+ install -m 644 -D -t $pkgdir/usr/lib/systemd/system/ calp.service
+ install -m 644 -D -t $pkgdir/etc/calp/ config.scm
}
diff --git a/system/config.scm b/system/config.scm
index bc3ce52c..fef7c9b5 100644
--- a/system/config.scm
+++ b/system/config.scm
@@ -1,3 +1,8 @@
+(use-modules (util config)
+ (ice-9 regex)
+ ((datetime) :select (mon))
+ (glob))
+
(set-config! 'calendar-files (glob "/var/lib/calp/.local/var/cal/*"))
(define (parse-links str)
@@ -16,5 +21,5 @@
(set-config! 'week-start mon)
;; (set-config! 'default-calendar "Calendar")
-(set-config 'port 8082)
-(set-config 'edit-mode #t)
+(set-config! 'port 8082)
+(set-config! 'edit-mode #t)