idk/tb-downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make OS flag work

Browse Source
This commit is contained in:
idk
2022-11-16 18:17:18 -05:00
parent 30272d3a7c
commit e6e03aa5a7
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
helper/helper.go
View File

@ -10,10 +10,12 @@ import (
) )
func getenv(v, d string) string { func getenv(v, d string) string {
m := os.Getenv("TOR_MIRROR") m := os.Getenv(v)
if m == "" { if m == "" {
log.Println(d)
return d return d
} }
log.Println(m)
return 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_OS = getenv("TOR_BROWSER_OS", tbget.OS())
var TOR_BROWSER_ARCH = getenv("TOR_BROWSER_ARCH", tbget.ARCH()) 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) { func DownloadVerifyUnpackTorBrowser(Directory string) (*exec.Cmd, error) {
lang := tbget.DefaultIETFLang lang := tbget.DefaultIETFLang
os := tbget.OS() os := TOR_BROWSER_OS
arch := tbget.ARCH() arch := TOR_BROWSER_ARCH
tbdownloader := tbget.NewTBDownloader(lang, os, arch, nil) tbdownloader := tbget.NewTBDownloader(lang, os, arch, nil)
tbdownloader.DownloadPath = Directory tbdownloader.DownloadPath = Directory
tbdownloader.Mirror = TOR_MIRROR tbdownloader.Mirror = TOR_MIRROR
@ -60,6 +66,7 @@ func DownloadVerifyUnpackTorBrowser(Directory string) (*exec.Cmd, error) {
tbdownloader.NoUnpack = TOR_NO_UNPACK tbdownloader.NoUnpack = TOR_NO_UNPACK
tbdownloader.Profile = &tbget.Content tbdownloader.Profile = &tbget.Content
tbdownloader.MakeTBDirectory() tbdownloader.MakeTBDirectory()
Log()
tgz, sig, _, err := tbdownloader.DownloadUpdaterForLang(lang) tgz, sig, _, err := tbdownloader.DownloadUpdaterForLang(lang)
if err != nil { if err != nil {
return nil, err return nil, err

16
tbget/main.go
View File

@ -17,16 +17,20 @@ func wd() string {
} }
var ( var (
launch = flag.Bool("launch", false, "Launch Tor Browser after downloading") launch = flag.Bool("launch", false, "Launch Tor Browser after downloading")
directory = flag.String("directory", wd(), "Directory to download Tor Browser to") 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() { 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() 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) cmd, err := tbget.DownloadVerifyUnpackTorBrowser(*directory)
if err != nil { if err != nil {
log.Fatalln(err) log.Fatalln(err)