diff --git a/helper/helper.go b/helper/helper.go index e2a1f9b..1fb9761 100644 --- a/helper/helper.go +++ b/helper/helper.go @@ -10,10 +10,12 @@ import ( ) func getenv(v, d string) string { - m := os.Getenv("TOR_MIRROR") + m := os.Getenv(v) if m == "" { + log.Println(d) return d } + log.Println(m) return m } @@ -49,10 +51,14 @@ var TOR_NO_UNPACK = getenvbool("TOR_NO_UNPACK", "false") var TOR_BROWSER_OS = getenv("TOR_BROWSER_OS", tbget.OS()) var TOR_BROWSER_ARCH = getenv("TOR_BROWSER_ARCH", tbget.ARCH()) +func Log() { + log.Printf("%s, %v, %v, %s, %s", TOR_MIRROR, TOR_DOWNLOADER_VERBOSE, TOR_NO_UNPACK, TOR_BROWSER_OS, TOR_BROWSER_ARCH) +} + func DownloadVerifyUnpackTorBrowser(Directory string) (*exec.Cmd, error) { lang := tbget.DefaultIETFLang - os := tbget.OS() - arch := tbget.ARCH() + os := TOR_BROWSER_OS + arch := TOR_BROWSER_ARCH tbdownloader := tbget.NewTBDownloader(lang, os, arch, nil) tbdownloader.DownloadPath = Directory tbdownloader.Mirror = TOR_MIRROR @@ -60,6 +66,7 @@ func DownloadVerifyUnpackTorBrowser(Directory string) (*exec.Cmd, error) { tbdownloader.NoUnpack = TOR_NO_UNPACK tbdownloader.Profile = &tbget.Content tbdownloader.MakeTBDirectory() + Log() tgz, sig, _, err := tbdownloader.DownloadUpdaterForLang(lang) if err != nil { return nil, err diff --git a/tbget/main.go b/tbget/main.go index cb140ee..86b96ac 100644 --- a/tbget/main.go +++ b/tbget/main.go @@ -17,16 +17,20 @@ func wd() string { } var ( - launch = flag.Bool("launch", false, "Launch Tor Browser after downloading") - directory = flag.String("directory", wd(), "Directory to download Tor Browser to") + launch = flag.Bool("launch", false, "Launch Tor Browser after downloading") + directory = flag.String("directory", wd(), "Directory to download Tor Browser to") + TOR_MIRROR = flag.String("mirror", "https://dist.torproject.org/torbrowser/", "Tor mirror to use") + TOR_DOWNLOADER_VERBOSE = flag.Bool("verbose", false, "Be verbose") + TOR_BROWSER_OS = flag.String("os", tbget.OS(), "OS to get Tor Browser for") + TOR_BROWSER_ARCH = flag.String("arch", tbget.ARCH(), "Tor Browser architecture to download") ) func main() { - tbget.TOR_MIRROR = *flag.String("mirror", "https://dist.torproject.org/torbrowser/", "Tor mirror to use") - tbget.TOR_DOWNLOADER_VERBOSE = *flag.Bool("verbose", false, "Be verbose") - tbget.TOR_BROWSER_OS = *flag.String("os", tbget.OS(), "OS to get Tor Browser for") - tbget.TOR_BROWSER_ARCH = *flag.String("arch", tbget.ARCH(), "Tor Browser architecture to download") flag.Parse() + tbget.TOR_MIRROR = *TOR_MIRROR + tbget.TOR_DOWNLOADER_VERBOSE = *TOR_DOWNLOADER_VERBOSE + tbget.TOR_BROWSER_OS = *TOR_BROWSER_OS + tbget.TOR_BROWSER_ARCH = *TOR_BROWSER_ARCH cmd, err := tbget.DownloadVerifyUnpackTorBrowser(*directory) if err != nil { log.Fatalln(err)