svk/projman
svk/projman
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Куафсещкштп

Browse Source
This commit is contained in:
svkalinin 2022-09-16 16:27:59 +03:00
parent bc432b8d84
commit b2fc6a3399
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/readstructure.tcl
View File

@ -132,17 +132,20 @@ proc ReadFilesFromDirectory {directory root {type ""}} {
} }
if {[string match {*inventory*} [string tolower $fileName]]} { if {[string match {*inventory*} [string tolower $fileName]]} {
lappend project($root) [file join $root $directory $fileName] lappend project($root) [file join $root $directory $fileName]
set variables([file join $root $directory $fileName]) [GetVariablesFromVarFile [file join $root $directory $fileName]] set variables([file join $root $directory $fileName]) \
[GetVariablesFromVarFile [file join $root $directory $fileName]]
} }
if {[string tolower $fileName] eq "ansible.cfg"} { if {[string tolower $fileName] eq "ansible.cfg"} {
# puts "find ansible.cfg [file join $root $directory $fileName]" # puts "find ansible.cfg [file join $root $directory $fileName]"
set f [open [file join $root $directory $fileName] r] set f [open [file join $root $directory $fileName] r]
while {[gets $f line] >= 0} { while {[gets $f line] >= 0} {
# puts "\t$line" if [regexp -nocase -all -- {^\s*inventory\s*=\s*(\.\/|)(.+?)$} $line match v1 fileName] {
if [regexp -nocase -all -- {^\s*inventory\s*=\s*(.+?)$} $line match fileName] {
# puts "Inventory file is a: $line" # puts "Inventory file is a: $line"
if {[lsearch $project($root) [file join $root $directory $fileName]] eq "-1"} {
lappend project($root) [file join $root $directory $fileName] lappend project($root) [file join $root $directory $fileName]
set variables([file join $root $directory $fileName]) [GetVariablesFromVarFile [file join $root $directory $fileName]] set variables([file join $root $directory $fileName]) \
[GetVariablesFromVarFile [file join $root $directory $fileName]]
}
} }
} }
close $f close $f
@ -153,7 +156,8 @@ proc ReadFilesFromDirectory {directory root {type ""}} {
# puts "[GetVariablesFromFile $fileName]" # puts "[GetVariablesFromFile $fileName]"
# dict set project $root [file join $root $directory $fileName];# "[GetVariablesFromFile $fileName]" # dict set project $root [file join $root $directory $fileName];# "[GetVariablesFromFile $fileName]"
lappend project($root) [file join $root $directory $fileName] lappend project($root) [file join $root $directory $fileName]
set variables([file join $root $directory $fileName]) [GetVariablesFromVarFile [file join $root $directory $fileName]] set variables([file join $root $directory $fileName]) \
[GetVariablesFromVarFile [file join $root $directory $fileName]]
# puts "[file join $root $directory $fileName]---$variables([file join $root $directory $fileName])" # puts "[file join $root $directory $fileName]---$variables([file join $root $directory $fileName])"
} }
} }