diff --git a/contrib/deb/generate.sh b/contrib/deb/generate.sh old mode 100644 new mode 100755 index a461a786..202ffb39 --- a/contrib/deb/generate.sh +++ b/contrib/deb/generate.sh @@ -68,6 +68,7 @@ EOF cat > /tmp/$PKGNAME/debian/install << EOF usr/bin/mesh usr/bin usr/bin/meshctl usr/bin +usr/bin/mesh-ui usr/bin etc/systemd/system/*.service etc/systemd/system EOF cat > /tmp/$PKGNAME/debian/postinst << EOF @@ -110,10 +111,11 @@ EOF cp mesh /tmp/$PKGNAME/usr/bin/ cp meshctl /tmp/$PKGNAME/usr/bin/ +cp mesh-ui /tmp/$PKGNAME/usr/bin/ cp contrib/systemd/*.service /tmp/$PKGNAME/etc/systemd/system/ tar -czvf /tmp/$PKGNAME/data.tar.gz -C /tmp/$PKGNAME/ \ - usr/bin/mesh usr/bin/meshctl \ + usr/bin/mesh usr/bin/meshctl usr/bin/mesh-ui \ etc/systemd/system/mesh.service \ etc/systemd/system/mesh-default-config.service tar -czvf /tmp/$PKGNAME/control.tar.gz -C /tmp/$PKGNAME/debian . diff --git a/contrib/msi/build-msi.sh b/contrib/msi/build-msi.sh index 40f7d5c4..13c84eea 100755 --- a/contrib/msi/build-msi.sh +++ b/contrib/msi/build-msi.sh @@ -168,7 +168,19 @@ cat > wix.xml << EOF Name="Mesh" Start="auto" Type="ownProcess" - Arguments='-useconffile "%ALLUSERSPROFILE%\\Mesh\\mesh.conf" -logto "%ALLUSERSPROFILE%\\Mesh\\mesh.log"' + Arguments='-useconffile "%ALLUSERSPROFILE%\\RiV-mesh\\mesh.conf" -logto "%ALLUSERSPROFILE%\\RiV-mesh\\mesh.log"' + Vital="yes" /> + + - - - - - - - Yggdrasil - - - - - - - -
- - -
- -
- - -
- -
-
-
IPv6
-
N/A
-
- -
-
- -
-
Subnet
-
N/A
-
- -
-
- -
- -
Peers
-
- -
-
- -
- -
- -
-
- - - - -
- - -
- -
- - - - diff --git a/contrib/ui/webview/ui.go b/contrib/ui/webview/ui.go deleted file mode 100755 index 2ca2a3a9..00000000 --- a/contrib/ui/webview/ui.go +++ /dev/null @@ -1,121 +0,0 @@ -package main - -import ( - "github.com/webview/webview" - "path/filepath" - "io/ioutil" - "net/url" - "runtime" - "strings" - "os/exec" - "log" - "os" - "fmt" -) - -func main() { - debug := true - w := webview.New(debug) - defer w.Destroy() - w.SetTitle("RiV-mesh") - w.SetSize(465, 410, webview.HintNone) - path, err := filepath.Abs(filepath.Dir(os.Args[0])) - if err != nil { - log.Fatal(err) - } - log.Println(path) - w.Bind("onLoad", func() { - log.Println("page loaded") - go run(w) - }) - dat, err := ioutil.ReadFile(path+"/index.html") - w.Navigate("data:text/html,"+url.QueryEscape(string(dat))) - w.Run() -} - -func run(w webview.WebView){ - if runtime.GOOS == "windows" { - program_path := "programfiles" - path, exists := os.LookupEnv(program_path) - if exists { - fmt.Println("Program path: %s", path) - riv_ctrl_path := fmt.Sprintf("%s\\RiV-mesh\\meshctl.exe", path) - get_self(w, riv_ctrl_path) - get_peers(w, riv_ctrl_path) - } else { - fmt.Println("could not find Program Files path") - } - } else { - riv_ctrl_path := fmt.Sprintf("meshctl") - get_self(w, riv_ctrl_path) - get_peers(w, riv_ctrl_path) - } -} - -func run_command(riv_ctrl_path string, command string) []string{ - cmd := exec.Command(riv_ctrl_path, command) - out, err := cmd.CombinedOutput() - if err != nil { - log.Fatalf("cmd.Run() failed with %s\n", err) - return nil - } - lines := strings.Split(string(out), "\n") - return lines -} - -func get_self(w webview.WebView, riv_ctrl_path string){ - - lines := run_command(riv_ctrl_path, "getSelf") - m := make(map[string]string) - for _, s := range lines { - p := strings.SplitN(s, ":", 2) - if len(p)>1 { - m[p[0]]=strings.TrimSpace(p[1]) - } - } - if val, ok := m["IPv6 address"]; ok { - //found ipv6 - fmt.Printf("IPv6: %s\n", val) - go setFieldValue(w, "ipv6", val) - } - if val, ok := m["IPv6 subnet"]; ok { - //found subnet - fmt.Printf("Subnet: %s\n", val) - go setFieldValue(w, "subnet", val) - } -} - -func get_peers(w webview.WebView, riv_ctrl_path string){ - - lines := run_command(riv_ctrl_path, "getPeers") - lines = lines[1:] /*remove first element which is a header*/ - var m []string - r:="" - for _, s := range lines { - p := strings.SplitN(s, " ", -1) - if len(p)>1 { - for _, t := range p { - if len(strings.TrimSpace(t))>0 { - r=strings.TrimSpace(t) - } - } - index_p := strings.Index(r, "%") - index_b := strings.Index(r, "]") - if index_p>0 && index_b>0 { - r = r[:index_p]+r[index_b:] - } - m=append(m, r) - } - } - for k := range m { // Loop - fmt.Println(k) - } - inner_html := strings.Join(m[:], "
") - go setFieldValue(w, "peers", inner_html) -} - -func setFieldValue(p webview.WebView, id string, value string) { - p.Dispatch(func() { - p.Eval("setFieldValue('"+id+"','"+value+"');") - }) -}