ralsina/tartrazine
1
0
Fork 0
mirror of https://github.com/ralsina/tartrazine.git synced 2024-11-10 13:32:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #86 from bzz/fix/panic-on-shebang

Browse Source 
Fix LanguagesByShebang strategy on single shebang
This commit is contained in:
Juanjo Alvarez Martinez 2017-07-25 13:22:48 +02:00 committed by GitHub
commit 116f9f7881
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.go
View File

@ -284,14 +284,16 @@ func getInterpreter(data []byte) (interpreter string) {
// skip shebang // skip shebang
line = bytes.TrimSpace(line[2:]) line = bytes.TrimSpace(line[2:])
splitted := bytes.Fields(line) splitted := bytes.Fields(line)
if len(splitted) == 0 {
return ""
}
if bytes.Contains(splitted[0], []byte("env")) { if bytes.Contains(splitted[0], []byte("env")) {
if len(splitted) > 1 { if len(splitted) > 1 {
interpreter = string(splitted[1]) interpreter = string(splitted[1])
} }
} else { } else {
splittedPath := bytes.Split(splitted[0], []byte{'/'}) splittedPath := bytes.Split(splitted[0], []byte{'/'})
interpreter = string(splittedPath[len(splittedPath)-1]) interpreter = string(splittedPath[len(splittedPath)-1])
} }

1
common_test.go
View File

@ -212,6 +212,7 @@ println("The shell script says ",vm.arglist.concat(" "));`
{name: "TestGetLanguagesByShebang_8", content: []byte(`#!bash`), expected: []string{"Shell"}}, {name: "TestGetLanguagesByShebang_8", content: []byte(`#!bash`), expected: []string{"Shell"}},
{name: "TestGetLanguagesByShebang_9", content: []byte(multilineExecHack), expected: []string{"Tcl"}}, {name: "TestGetLanguagesByShebang_9", content: []byte(multilineExecHack), expected: []string{"Tcl"}},
{name: "TestGetLanguagesByShebang_10", content: []byte(multilineNoExecHack), expected: []string{"Shell"}}, {name: "TestGetLanguagesByShebang_10", content: []byte(multilineNoExecHack), expected: []string{"Shell"}},
{name: "TestGetLanguagesByShebang_11", content: []byte(`#!`), expected: nil},
} }
for _, test := range tests { for _, test := range tests {