From 58f42147560397224635a83e76e149f0cddb70f7 Mon Sep 17 00:00:00 2001 From: Francesco Cartier Date: Mon, 21 Jun 2021 18:01:32 +0200 Subject: [PATCH 1/2] added Windows basepath to UI setup --- modules/ui/ui.go | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/ui/ui.go b/modules/ui/ui.go index f5d6950e..8e033f24 100644 --- a/modules/ui/ui.go +++ b/modules/ui/ui.go @@ -9,6 +9,7 @@ import ( "os" "path/filepath" "regexp" + "runtime" "github.com/bettercap/bettercap/session" @@ -35,10 +36,21 @@ func NewUIModule(s *session.Session) *UIModule { client: github.NewClient(nil), } - mod.AddParam(session.NewStringParameter("ui.basepath", - "/usr/local/share/bettercap/", - "", - "UI base installation path.")) + var basePath *session.ModuleParam + + if runtime.GOOS == "windows" { + basePath = session.NewStringParameter("ui.basepath", + filepath.Join(os.Getenv("ALLUSERSPROFILE"), "bettercap"), + "", + "UI base installation path.") + } else { + basePath = session.NewStringParameter("ui.basepath", + "/usr/local/share/bettercap/", + "", + "UI base installation path.") + } + + mod.AddParam(basePath) mod.AddParam(session.NewStringParameter("ui.tmpfile", filepath.Join(os.TempDir(), "ui.zip"), From f10159ec196b16e5f1fddf42d3cc7b9512c76ffe Mon Sep 17 00:00:00 2001 From: Francesco Cartier Date: Mon, 21 Jun 2021 18:08:54 +0200 Subject: [PATCH 2/2] added Windows basepath to UI setup --- modules/ui/ui.go | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/modules/ui/ui.go b/modules/ui/ui.go index 8e033f24..7bc5270f 100644 --- a/modules/ui/ui.go +++ b/modules/ui/ui.go @@ -30,27 +30,23 @@ type UIModule struct { uiPath string } +func getDefaultInstallBase() string { + if runtime.GOOS == "windows" { + return filepath.Join(os.Getenv("ALLUSERSPROFILE"), "bettercap") + } + return "/usr/local/share/bettercap/" +} + func NewUIModule(s *session.Session) *UIModule { mod := &UIModule{ SessionModule: session.NewSessionModule("ui", s), client: github.NewClient(nil), } - var basePath *session.ModuleParam - - if runtime.GOOS == "windows" { - basePath = session.NewStringParameter("ui.basepath", - filepath.Join(os.Getenv("ALLUSERSPROFILE"), "bettercap"), - "", - "UI base installation path.") - } else { - basePath = session.NewStringParameter("ui.basepath", - "/usr/local/share/bettercap/", - "", - "UI base installation path.") - } - - mod.AddParam(basePath) + mod.AddParam(session.NewStringParameter("ui.basepath", + getDefaultInstallBase(), + "", + "UI base installation path.")) mod.AddParam(session.NewStringParameter("ui.tmpfile", filepath.Join(os.TempDir(), "ui.zip"),