From 1bac06a43b3af9df09226e2e4fada60eb1e8164b Mon Sep 17 00:00:00 2001 From: idk Date: Thu, 3 Feb 2022 02:06:39 -0500 Subject: [PATCH] Fix some path determination stuff --- Makefile | 2 +- get/get.go | 27 ++++++++++++++++----------- link_windows.go | 6 ++++++ tor-browser/lib/shellservice.jar | Bin 4172 -> 4761 bytes 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 2036120..e655e3c 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ bsd: # GOOS=openbsd GOARCH=amd64 make build su3 dep: - cp "$(HOME)/Workspace/GIT_WORK/i2p.i2p/build/shellservice.jar" tor-browser/lib/shellservice.jar -v + cp "$(HOME)/build/shellservice.jar" tor-browser/lib/shellservice.jar -v su3: i2p.plugin.native -name=$(BINARY) \ diff --git a/get/get.go b/get/get.go index 2854dc8..b1f1f33 100644 --- a/get/get.go +++ b/get/get.go @@ -36,16 +36,20 @@ func DefaultDir() string { if !FileExists(WORKING_DIR) { os.MkdirAll(WORKING_DIR, 0755) } - return WORKING_DIR + wd, err := filepath.Abs(WORKING_DIR) + if err != nil { + log.Fatal(err) + } + return wd } func UNPACK_PATH() string { - var UNPACK_PATH = path.Join(DefaultDir(), "unpack") + var UNPACK_PATH = filepath.Join(DefaultDir(), "unpack") return UNPACK_PATH } func DOWNLOAD_PATH() string { - var DOWNLOAD_PATH = path.Join(DefaultDir(), "tor-browser") + var DOWNLOAD_PATH = filepath.Join(DefaultDir(), "tor-browser") return DOWNLOAD_PATH } @@ -164,15 +168,16 @@ func (t *TBDownloader) Log(function, message string) { func (t *TBDownloader) MakeTBDirectory() { os.MkdirAll(t.DownloadPath, 0755) - path := path.Join("tor-browser", "TPO-signing-key.pub") + empath := path.Join("tor-browser", "TPO-signing-key.pub") + path := filepath.Join(t.DownloadPath, "TPO-signing-key.pub") if !FileExists(path) { t.Log("MakeTBDirectory()", "Initial TPO signing key not found, using the one embedded in the executable") - bytes, err := t.Profile.ReadFile(path) + bytes, err := t.Profile.ReadFile(empath) if err != nil { log.Fatal(err) } t.Log("MakeTBDirectory()", "Writing TPO signing key to disk") - ioutil.WriteFile(filepath.Join(t.DownloadPath, "TPO-signing-key.pub"), bytes, 0644) + ioutil.WriteFile(path, bytes, 0644) t.Log("MakeTBDirectory()", "Writing TPO signing key to disk complete") } } @@ -336,17 +341,17 @@ func (t *TBDownloader) UnpackUpdater(binpath string) (string, error) { os.MkdirAll(t.UnpackPath, 0755) UNPACK_DIRECTORY, err := os.Open(t.UnpackPath) if err != nil { - return "", fmt.Errorf("UnpackUpdater: %s", err) + return "", fmt.Errorf("UnpackUpdater: directory error %s", err) } defer UNPACK_DIRECTORY.Close() xzfile, err := os.Open(binpath) if err != nil { - return "", fmt.Errorf("UnpackUpdater: %s", err) + return "", fmt.Errorf("UnpackUpdater: XZFile error %s", err) } defer xzfile.Close() xzReader, err := xz.NewReader(xzfile) if err != nil { - return "", fmt.Errorf("UnpackUpdater: %s", err) + return "", fmt.Errorf("UnpackUpdater: XZReader error %s", err) } tarReader := tar.NewReader(xzReader) for { @@ -355,7 +360,7 @@ func (t *TBDownloader) UnpackUpdater(binpath string) (string, error) { break } if err != nil { - return "", fmt.Errorf("UnpackUpdater: %s", err) + return "", fmt.Errorf("UnpackUpdater: Tar looper Error %s", err) } if header.Typeflag == tar.TypeDir { os.MkdirAll(filepath.Join(UNPACK_DIRECTORY.Name(), header.Name), 0755) @@ -364,7 +369,7 @@ func (t *TBDownloader) UnpackUpdater(binpath string) (string, error) { filename := filepath.Join(UNPACK_DIRECTORY.Name(), header.Name) file, err := os.Create(filename) if err != nil { - return "", fmt.Errorf("UnpackUpdater: %s", err) + return "", fmt.Errorf("UnpackUpdater: Tar unpacker error %s", err) } defer file.Close() io.Copy(file, tarReader) diff --git a/link_windows.go b/link_windows.go index 7b094b5..3fb4a43 100644 --- a/link_windows.go +++ b/link_windows.go @@ -1,12 +1,18 @@ package main import ( + "log" + "github.com/go-ole/go-ole" "github.com/go-ole/go-ole/oleutil" "os/user" "path/filepath" ) +func GenerateAppArmor() error { + return nil +} + func DesktopDirectory() (string, error) { myself, error := user.Current() if error != nil { diff --git a/tor-browser/lib/shellservice.jar b/tor-browser/lib/shellservice.jar index ff8d1bf1098ee1bed15a1d26dd3128bfcfcfa4c3..7ef1243596c943d4208807658d737896a58cfadb 100644 GIT binary patch delta 4066 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 Qe`Wp!J)s(BB>C_D1K_yI9RL6T delta 3473 zcmV;C4Q}$8CCnfVP)h>@6aWYa2mpa1K9LPN1A!twkxF<2fg(PU#UBHKB0iDlBLjgV zK9darDg%KcK9f2DE(3ugK9g$!Hh+~^X<$^<75;8AnfEezi5S+fIiO%j0#VeefJjJ! z211A=fZ!5eW**7Y$;>!QfY!FQ+PbxNRg2nM7euWql0l?ZTdTIVb?xrb#kIA&+Qr)1 z@7$S5-h>I&AG!D4d(VEpbMBoy{@?o_0C2QgAApOS%dr!;lp}y!P248)H-BWfU4}bk zxHEveaJPYb0@#InWoLJQ!;pbY09Dvy;JyIH;bs$iWxhXv8)Beo2Ox zO}t{_RXKmn!0RS{7r^iFhKWA}(2Pea@JIYfg#1~E|6<~=BK&VA-jvO^MBUqB!rue< z2mWc|Unbr$@oyn|*TjE>{l5XcryzqeRf(xexv6|)S7oO1Giu5(m48VNRc@+)sVYom zQJSihttwL;WU6t7I@nOv3Kbnqt6O{4bauC`=}@R{KieL(8zXkKudyqYaHD;T6)Kx! z(PYYwrqiCD-v22G)2PIcGT|E(kx0F7_g(^PCM1FP~PJt60trLCF%W3 z+^Cycs<5hd4DSx?(rNoAYTkO9(Hsj?@j>lw)aghM^g4-dyEnp}N*WqEXSE&IYu2Hm zCKzg>p(YW^EFcD)QU;n5eMyD7+G66fTRMwPiG;na-Azgk%DddYsGUkDsAcK3_<`d`0bng1)~5&ra*skP}b2v8WEqksnZy@EA;dB9&$aOKaz?H`HVz zV_0g^P*W7fxyf8cyHc@u+zD&iP2PjG>1dP^8Qx@nIu(v>i7HGg8YQYU`I<1XsOxiP)i+#8!R9K9YDbH=uniG*32!H0Jk(rE&BHYcQ<}5gBN&c3$zU{=3OZW} zVlkpli0XxCTAs+wlQ^MtO3H0fkVy{?*okwfE9iQUEY%PP}59!dAP(PX2XEM!!4J6phpYvIHA2y>lnVSm}3^Y9T%9i@)8)G;!ANQPr2y;a`) zWQ|NZgnUqY!T#jh5%Ld%Fz$XoLvZdMtA?>Y_rXUMb$bz{f2ViS%(Q2&2|$gZe^A+6C;UHM3|o$9t(-j(~Lle0Y!(QDCl*Kcmd9cd z$ByPJP49L0Ct_Q&clgw?F9f#gbscRTZQX56?QNS{Ti5|u`oo&1d2W+@s~ve9O&;Tj zEtOE!&!9QA9@Cp6tgOZROO(ezvVT98j)XOjueMF@LO-o_qD;d4+A-e-`*(VI0j6Tv zExz-@PH&p?#9|_NahB3fIc@XG%jQ$wTDn;?Z)LhoGBzPQ+NxVH1LxafCm8ZdcD~l( zwk+0f66?p;dR{O3#UuJG>SNY7yL~M#<&DeVz$1^yLu(6nirZbq5_DPWsed)PUCYa> zkZs<9p2(GX?$)eZ<=Is%v5gO@LNMrxNp5iE@mn;Abk&pxx2*v_tsvd~cB0EUH|<12 zjwUQ)=XPoA;l%_M#dxV54v$it%Z`36jk;HoBKou1PP+NK)EvchlPLwvLk|5`Pj`@vKOq3Tr#J$u{C9nwLm)heq__X>4g&atH!SGHJzQ>S|jWvQ;8U3 zZs^U{7R-YD7eL``{?wj|a}eS80DuxK<~r(GFXKAqS;tW=4?=!d%YOq$&wO0!neR(I z^KqtUK5g`To}NqOjmmksJWKU_zMf0u(&b!19T(t2j-TRYH_BiD>gKvVP<6XdGKA8) zYTppb^ysgvAA(WWFa)!%K7;b=Kn4{jp1EPf3G(g1{6&6ER^zW;z|{~M^UEXj@_$J3*YWSj3>I$4eK%%s zl>V;qXK?fehX0tn_z!tvbZlP7arfvvewyPTW^inSkNK@Y3l2srCSxV0V--=?js@tz zG3Z1SPC*aW;$p1B71)3qa4K%YMr5!F&*F4EhcoaR&Q#^-QRC37W+1GZ;i$FPtZekD z0rabFaMcAkTYv2!f-j=hAbjspV3~o74P0X2QUjM6_zdtaRvP&1F@D;}-!UACFqNc@ zK63qWAC9MMi&mE|ol*b54cJjXV`25;43=!i0{J{4gQeRsp)U7*qHiHVxD#8s;X6yd zFDz9%;mYx{19SOzVtJm+uepx$0QC?r1ezFHvJRuKL4PlnZxF8cPLl*YhPnIDyfM$v zA`JJTRr0bTpO=#!6bL_t3Q1}il{VZxoTyEh#4!ewB|VNMJ&i>@mnD5H%Xt~oxPrxe z3QPHPmhk{fc#!3L9!vIOmg`L{*xSjsi-FurX^%7f&-3IZT!J@nsZPcO1pb2n!><~u z=2jhUynlnTc~$tl*8c^}mUnx$)NwLPT@o>kMwZs^z(lF-QZ8894fFTn=HY9 zKY!hV%Wx~MV#nA^AU=#c@Cxq4o45<_;BMu|J^YD(FMl-eRvR&-Ldd8n-MmQS$DGA} z(68p#zl&A_SIwV*uW;W-aBSxve+uRRbOdL`xsraIaWxFzPWVc1A2!yn4lok$+I-@|QtRK|V*6PNFK{2}1Wtl;bH(#M4-U zXS5MMl$0-I%)ZJ9W&!P&J)Z17AfV660opE>yIwC|Iv>S}9xocaUW7bM;ZZ2g`QcE> z=3+|vMuU<789~KD;sLx5EVh^_c!3_iNL2iqsQ3-8`JkD#^WtQ z>}_6we`k;VXFi2T)YGWzc^zhroRI@znKbabhg+BipAv-KSd`R1nzWMRP1=qf{{v7< z2M8xfecsOu000Ua002-+0Rj{N6bJwa2nYayB0iJc5I6&YB0iHB5kCWgB0iH@5ibLQ zB0iIg5i