Skip to content
Snippets Groups Projects

[feat] only one systray can be in execution

Closed meskio requested to merge meskio/bitmask-vpn:feat/17_no_launch_twice into master
3 files
+ 107
4
Compare changes
  • Side-by-side
  • Inline
Files
3
+ 17
4
@@ -30,6 +30,12 @@ const (
@@ -30,6 +30,12 @@ const (
var printer *message.Printer
var printer *message.Printer
func main() {
func main() {
 
err := acquirePID()
 
if err != nil {
 
log.Fatal(err)
 
}
 
defer releasePID()
 
conf := parseConfig()
conf := parseConfig()
initPrinter()
initPrinter()
@@ -37,22 +43,28 @@ func main() {
@@ -37,22 +43,28 @@ func main() {
b, err := bitmask.Init()
b, err := bitmask.Init()
if err != nil {
if err != nil {
log.Fatal(err)
log.Print(err)
 
return
}
}
defer b.Close()
defer b.Close()
checkAndInstallHelpers(b, notify)
err = checkAndInstallHelpers(b, notify)
 
if err != nil {
 
log.Printf("Is bitmask running? %v", err)
 
return
 
}
 
run(b, conf)
run(b, conf)
}
}
func checkAndInstallHelpers(b *bitmask.Bitmask, notify *notificator) {
func checkAndInstallHelpers(b *bitmask.Bitmask, notify *notificator) error {
helpers, priviledge, err := b.VPNCheck()
helpers, priviledge, err := b.VPNCheck()
if (err != nil && err.Error() == "nopolkit") || (err == nil && !priviledge) {
if (err != nil && err.Error() == "nopolkit") || (err == nil && !priviledge) {
log.Printf("No polkit found")
log.Printf("No polkit found")
notify.authAgent()
notify.authAgent()
} else if err != nil {
} else if err != nil {
notify.bitmaskNotRunning()
notify.bitmaskNotRunning()
log.Fatal("Is bitmask running? ", err)
return err
}
}
if !helpers {
if !helpers {
@@ -61,6 +73,7 @@ func checkAndInstallHelpers(b *bitmask.Bitmask, notify *notificator) {
@@ -61,6 +73,7 @@ func checkAndInstallHelpers(b *bitmask.Bitmask, notify *notificator) {
log.Println("Error installing helpers: ", err)
log.Println("Error installing helpers: ", err)
}
}
}
}
 
return nil
}
}
func initPrinter() {
func initPrinter() {
Loading