From 7968d3b30a4da523ffaa2fbd23120921084bf54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Thu, 30 Apr 2020 12:56:05 +0200 Subject: Move environment setup to standalone sh file. --- module/main.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'module/main.scm') diff --git a/module/main.scm b/module/main.scm index 246e729c..c90adb0c 100755 --- a/module/main.scm +++ b/module/main.scm @@ -1,10 +1,8 @@ -#!/bin/bash -# -*- mode: scheme; geiser-scheme-implementation: guile -*- +;; -*- geiser-scheme-implementation: guile -*- -. $(dirname $(dirname $(realpath $0)))/env +(when (current-filename) + (add-to-load-path (dirname (current-filename)))) -exec guile -e main -s $0 "$@" -!# (use-modules (srfi srfi-1) (srfi srfi-41) -- cgit v1.2.3 From 3fe27b00588c442af4fca49f9c106c0486bd235a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Thu, 30 Apr 2020 18:18:23 +0200 Subject: Add global basedir var. --- module/main.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'module/main.scm') diff --git a/module/main.scm b/module/main.scm index c90adb0c..b2899014 100755 --- a/module/main.scm +++ b/module/main.scm @@ -3,6 +3,7 @@ (when (current-filename) (add-to-load-path (dirname (current-filename)))) +(set! (@ (global) basedir) (car %load-path)) (use-modules (srfi srfi-1) (srfi srfi-41) -- cgit v1.2.3 From 8b426edf1b6d4de0ec825da8a34b1df7b51212db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Thu, 30 Apr 2020 18:37:03 +0200 Subject: Update ical parts to use app context. --- module/main.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'module/main.scm') diff --git a/module/main.scm b/module/main.scm index b2899014..96fe2da1 100755 --- a/module/main.scm +++ b/module/main.scm @@ -13,6 +13,7 @@ (util) (util io) (util time) + (util app) ((entry-points html) :prefix html-) ((entry-points terminal) :prefix terminal-) @@ -31,6 +32,7 @@ ) + (define options '((statprof (value optional)) (repl (value optional)) @@ -56,6 +58,12 @@ (when (file-exists? config-file) (primitive-load config-file))) + + (current-app (make-app)) + + ((@ (vcomponent) init-app) (get-config 'calendar-files)) + ((@ (datetime app) init-app)) + (let ((ropt (ornull (option-ref opts '() '()) '("term")))) ((case (string->symbol (car ropt)) -- cgit v1.2.3 From fe294992fda2015305c9f85725e8b68a1b3ccfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Thu, 30 Apr 2020 19:01:31 +0200 Subject: Minor changes. --- module/main.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/main.scm') diff --git a/module/main.scm b/module/main.scm index 96fe2da1..332d9990 100755 --- a/module/main.scm +++ b/module/main.scm @@ -59,7 +59,7 @@ (primitive-load config-file))) - (current-app (make-app)) + ;; (current-app (make-app)) ((@ (vcomponent) init-app) (get-config 'calendar-files)) ((@ (datetime app) init-app)) -- cgit v1.2.3