Skip to content

Commit 611bfad

Browse files
committed
only use the global script variables when it's safe to do; provide an option to disable using them altogether
1 parent 5f62c23 commit 611bfad

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

macros/l0.DependencyControl.Toolbox.moon

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ install = ->
9999
for channel, rec in pairs channels
100100
item = "%s v%s%s"\format rec.name, rec.version, rec.default and "" or " [#{channel}]"
101101
list[#list+1] = item
102-
map[item] = :namespace, :channel, feed: rec.feed, name: rec.name, virtual: true, moduleName: rec.moduleName
102+
map[item] = { :namespace, :channel, feed: rec.feed, name: rec.name, virtual: true,
103+
moduleName: rec.moduleName, noReadGlobalScriptVars: true }
103104

104105
return list, map
105106

modules/DependencyControl.moon

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class DependencyControl
7272
new: (args)=>
7373
{@requiredModules, moduleName:@moduleName, configFile:configFile, virtual:@virtual, :name,
7474
description:@description, url:@url, feed:@feed, unmanaged:@unmanaged, :namespace,
75-
author:@author, :version, configFile:@configFile} = args
75+
author:@author, :version, configFile:@configFile, :noReadGlobalScriptVars} = args
7676

7777
if @moduleName
7878
@namespace = @moduleName
@@ -81,10 +81,15 @@ class DependencyControl
8181
@createDummyRef! unless @virtual or @unmanaged
8282

8383
else
84-
@name or= @virtual and namespace or script_name
85-
@description or= script_description
86-
@author or= script_author
87-
version or= script_version
84+
if @virtual or noReadGlobalScriptVars
85+
@name = name or namespace
86+
@namespace = namespace
87+
version or= 0
88+
else
89+
@name = name or script_name
90+
@description or= script_description
91+
@author or= script_author
92+
version or= script_version
8893

8994
@namespace = namespace or script_namespace
9095
assert not @unmanaged, msgs.new.badRecordError\format msgs.new.badRecord.noUnmanagedMacros
@@ -101,7 +106,7 @@ class DependencyControl
101106

102107
@configFile = configFile or "#{@namespace}.json"
103108
@automationDir = @@automationDir[@type]
104-
@version, err = @getVersionNumber version or @virtual and -1
109+
@version, err = @getVersionNumber version
105110
assert @version, msgs.new.badRecordError\format msgs.new.badRecord.badVersion\format err
106111

107112
@requiredModules or= {}

0 commit comments

Comments
 (0)