Skip to content

Commit 2f61735

Browse files
committed
main: allow passing list of files to loadVirtualPrograms
1 parent c7cbbe9 commit 2f61735

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

main.tcl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -605,19 +605,24 @@ if {[info exists ::entry]} {
605605
# process.
606606
set ::thisProcess $::thisNode
607607

608-
proc ::loadVirtualPrograms {} {
608+
proc ::loadVirtualPrograms {{programs ""}} {
609+
if {$programs eq ""} {
610+
set programs [list {*}[glob virtual-programs/*.folk] \
611+
{*}[glob virtual-programs/*/*.folk] \
612+
{*}[glob -nocomplain "user-programs/[info hostname]/*.folk"] \
613+
{*}[glob -nocomplain "$::env(HOME)/folk-live/*.folk"] \
614+
{*}[glob -nocomplain "$::env(HOME)/folk-live/*/*.folk"]]
615+
}
616+
609617
set ::rootVirtualPrograms [dict create]
610618
proc loadProgram {programFilename} {
611619
# this is a proc so its variables don't leak
612620
set fp [open $programFilename r]
613621
dict set ::rootVirtualPrograms $programFilename [read $fp]
614622
close $fp
615623
}
616-
foreach programFilename [list {*}[glob virtual-programs/*.folk] \
617-
{*}[glob virtual-programs/*/*.folk] \
618-
{*}[glob -nocomplain "user-programs/[info hostname]/*.folk"] \
619-
{*}[glob -nocomplain "$::env(HOME)/folk-live/*.folk"] \
620-
{*}[glob -nocomplain "$::env(HOME)/folk-live/*/*.folk"]] {
624+
625+
foreach programFilename $programs {
621626
if {[string match "*/_archive/*" $programFilename] ||
622627
[string match "*/folk-printed-programs/*" $programFilename]} { continue }
623628
loadProgram $programFilename

0 commit comments

Comments
 (0)