dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow files named on command line to have arbitrary names (assume guile input format).

Browse source
This commit is contained in:
Dale Mellor 2008-01-26 10:50:59 +00:00 • committed by Dale Mellor
commit 3094f9b791
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2008-01-25 Dale Mellor <Dale Mellor <dale_mellor@users.sourceforge.net>>
* main.scm (command-type): Files which are listed on the command
line are assumed to be guile configurations if they do not end in
.guile or .vixie (previously they were silently ignored).
* main.scm: Argument to --schedule is no longer optional (the
options system goes really screwy with optional values, usually
pulling the first non-option argument as a value if one was not

11
main.scm
View file

@ -283,15 +283,16 @@ Report bugs to " config-package-bugreport ".\n
(define guile-file-regexp (make-regexp "\\.gui(le)?$"))
(define vixie-file-regexp (make-regexp "\\.vix(ie)?$"))
(define (process-user-file file-path)
(define (process-user-file file-path . assume-guile)
(cond ((string=? file-path "-")
(if (string=? (option-ref options 'stdin "guile") "vixie")
(read-vixie-port (current-input-port))
(eval-string (stdin->string))))
((regexp-exec guile-file-regexp file-path)
(load file-path))
((or (not (null? assume-guile))
(regexp-exec guile-file-regexp file-path))
(load file-path))
((regexp-exec vixie-file-regexp file-path)
(read-vixie-file file-path))))
(read-vixie-file file-path))))
@ -368,7 +369,7 @@ Report bugs to " config-package-bugreport ".\n
((mcron) (if (null? (option-ref options '() '()))
(process-files-in-user-directory)
(for-each (lambda (file-path)
(process-user-file file-path))
(process-user-file file-path #t))
(option-ref options '() '()))))
((cron) (process-files-in-system-directory)