[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/3] scripts: Separate build/install directory context
From: |
Mathieu Lirzin |
Subject: |
[PATCH 3/3] scripts: Separate build/install directory context |
Date: |
Fri, 8 May 2020 18:43:43 +0200 |
This prevents installed modules to interfere with the ones from the
build directory.
* src/cron.in: Augment Guile load paths with install directories only
when MCRON_UNINSTALLED environment variable is not set.
* src/crontab.in: Likewise.
* src/mcron.in : Likewise.
---
src/cron.in | 8 +++++---
src/crontab.in | 6 ++++--
src/mcron.in | 8 +++++---
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/cron.in b/src/cron.in
index 97d49b4..25ad273 100644
--- a/src/cron.in
+++ b/src/cron.in
@@ -2,7 +2,9 @@
-*- scheme -*-
!#
-(set! %load-path (cons "%modsrcdir%" %load-path))
-(set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))
-(use-modules (mcron scripts cron))
+(unless (getenv "MCRON_UNINSTALLED")
+ (set! %load-path (cons "%modsrcdir%" %load-path))
+ (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path)))
+
+(use-modules (mcron scripts cron))
(main)
diff --git a/src/crontab.in b/src/crontab.in
index fa31878..dad0dd2 100644
--- a/src/crontab.in
+++ b/src/crontab.in
@@ -2,6 +2,8 @@
-*- scheme -*-
!#
-(set! %load-path (cons "%modsrcdir%" %load-path))
-(set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))
+(unless (getenv "MCRON_UNINSTALLED")
+ (set! %load-path (cons "%modsrcdir%" %load-path))
+ (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path)))
+
((@ (mcron scripts crontab) main))
diff --git a/src/mcron.in b/src/mcron.in
index 4519ad0..268743c 100644
--- a/src/mcron.in
+++ b/src/mcron.in
@@ -2,7 +2,9 @@
-*- scheme -*-
!#
-(set! %load-path (cons "%modsrcdir%" %load-path))
-(set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path))
-(use-modules (mcron scripts mcron))
+(unless (getenv "MCRON_UNINSTALLED")
+ (set! %load-path (cons "%modsrcdir%" %load-path))
+ (set! %load-compiled-path (cons "%modbuilddir%" %load-compiled-path)))
+
+(use-modules (mcron scripts mcron))
(main)
--
2.20.1