re-add key
This commit is contained in:
5
main.go
5
main.go
@ -1,6 +1,7 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"flag"
|
||||
"log"
|
||||
|
||||
@ -8,6 +9,9 @@ import (
|
||||
tbserve "i2pgit.org/idk/i2p.plugins.tor-manager/serve"
|
||||
)
|
||||
|
||||
//go:embed tor-browser/unpack/i2p.firefox/*
|
||||
var content embed.FS
|
||||
|
||||
//var runtimePair = tbget.GetRuntimePair()
|
||||
|
||||
var (
|
||||
@ -37,6 +41,7 @@ func main() {
|
||||
if err != nil {
|
||||
log.Fatal("Couldn't create client", err)
|
||||
}
|
||||
client.TBS.Profile = &content
|
||||
if *i2pbrowser {
|
||||
client.TBS.RunI2PBWithLang()
|
||||
} else if *torbrowser {
|
||||
|
@ -1,7 +1,9 @@
|
||||
package tbsupervise
|
||||
|
||||
import (
|
||||
"embed"
|
||||
"fmt"
|
||||
"io/fs"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
@ -26,6 +28,7 @@ type Supervisor struct {
|
||||
torcmd *exec.Cmd
|
||||
tbcmd *exec.Cmd
|
||||
ibcmd *exec.Cmd
|
||||
Profile *embed.FS
|
||||
}
|
||||
|
||||
func (s *Supervisor) TBPath() string {
|
||||
@ -49,9 +52,34 @@ func (s *Supervisor) TorDataPath() string {
|
||||
}
|
||||
|
||||
func (s *Supervisor) I2PDataPath() string {
|
||||
//if tbget.FileExists(filepath.Join(s.UnpackPath, "i2p.firefox")) {
|
||||
if tbget.FileExists(filepath.Join(s.UnpackPath, "i2p.firefox")) {
|
||||
return filepath.Join(filepath.Dir(s.UnpackPath), "i2p.firefox")
|
||||
//}
|
||||
} else {
|
||||
//unpack the embedded profile
|
||||
if s.Profile != nil {
|
||||
if err := s.UnpackI2PData(); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
return filepath.Join(filepath.Dir(s.UnpackPath), "i2p.firefox")
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Supervisor) UnpackI2PData() error {
|
||||
return fs.WalkDir(s.Profile, ".", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
log.Printf("WALKING PROFILE DIRECTORY", d.Name())
|
||||
/*if d.IsDir() {
|
||||
os.MkdirAll(filepath.Join(s.I2PDataPath(), d.Name()), 0755)
|
||||
} else {
|
||||
if err := fs.CopyFile(filepath.Join(s.I2PDataPath(), d.Name()), filepath.Join(s.Profile.Path, d.Name())); err != nil {
|
||||
return err
|
||||
}
|
||||
}*/
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Supervisor) tbbail() error {
|
||||
|
3197
tor-browser/TPO-signing-key.pub
Normal file
3197
tor-browser/TPO-signing-key.pub
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user