Merge pull request #403 from Morganamilo/fixnil

Lint
This commit is contained in:
Anna 2018-05-10 20:19:33 +01:00 committed by GitHub
commit 665d49f8e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -96,7 +96,7 @@ func downloadAndUnpack(url string, path string, trim bool) (err error) {
if trim {
err = exec.Command("/bin/sh", "-c",
config.TarBin+" --strip-components 2 --include='*/"+fileName[:len(fileName)-7]+"/trunk/' -xf "+tarLocation+" -C "+path).Run()
os.Rename(filepath.Join(path, "trunk"), filepath.Join(path,fileName[:len(fileName)-7]))
os.Rename(filepath.Join(path, "trunk"), filepath.Join(path, fileName[:len(fileName)-7]))
} else {
err = exec.Command(config.TarBin, "-xf", tarLocation, "-C", path).Run()
}

View file

@ -3,11 +3,11 @@ package main
import (
"bytes"
"fmt"
"html"
"io"
"os"
"strconv"
"strings"
"html"
)
// A basic set implementation for strings.