Merge branch 'custom-tunnels-path'

.gitignore

@@ -16,4 +16,8 @@
 
 ./wireguird
 ./wireguird.glade~
-./wireguird.settings
+./wireguird.settings
+
+deb/
+build/
+static/*.go

gui/gui.go

@@ -15,10 +15,10 @@ import (
 )
 
 const (
-	Version     = "1.1.0"
+	Version            = "1.1.0"
-	Repo        = "https://github.com/UnnoTed/wireguird"
+	Repo               = "https://github.com/UnnoTed/wireguird"
-	TunnelsPath = "/etc/wireguard/"
+	DefaultTunnelsPath = "/etc/wireguard/"
-	IconPath    = "/opt/wireguird/Icon/"
+	IconPath           = "/opt/wireguird/Icon/"
 )
 
 var (
@@ -31,6 +31,7 @@ var (
 	header         *gtk.HeaderBar
 	wgc            *wgctrl.Client
 	updateTicker   *time.Ticker
+	TunnelsPath    string
 )
 
 func Create(app *gtk.Application, b *gtk.Builder, w *gtk.ApplicationWindow, ind *appindicator.Indicator) error {

gui/tunnels.go

@@ -229,7 +229,7 @@ func (t *Tunnels) Create() error {
 					t.icons[d.Name].SetFromPixbuf(gray.GetPixbuf())
 				})
 
-				c := exec.Command("wg-quick", "down", d.Name)
+				c := exec.Command("wg-quick", "down", TunnelsPath+d.Name+".conf")
 				output, err := c.Output()
 				if err != nil {
 					es := string(err.(*exec.ExitError).Stderr)
@@ -283,7 +283,7 @@ func (t *Tunnels) Create() error {
 			}
 
 			// connect to a tunnel
-			c := exec.Command("wg-quick", "up", name)
+			c := exec.Command("wg-quick", "up", TunnelsPath+name+".conf")
 			output, err := c.Output()
 			if err != nil {
 				es := string(err.(*exec.ExitError).Stderr)

main.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"os"
+	"strings"
 
 	"github.com/UnnoTed/go-appindicator"
 	"github.com/UnnoTed/horizontal"
@@ -21,6 +22,15 @@ func main() {
 	log.Logger = log.Output(horizontal.ConsoleWriter{Out: os.Stderr})
 	log.Info().Uint("major", gtk.GetMajorVersion()).Uint("minor", gtk.GetMinorVersion()).Uint("micro", gtk.GetMicroVersion()).Msg("GTK Version")
 
+	if gui.Settings.TunnelsPath == "" {
+		gui.TunnelsPath = gui.DefaultTunnelsPath
+	} else {
+		gui.TunnelsPath = gui.Settings.TunnelsPath
+	}
+	if !strings.HasSuffix(gui.TunnelsPath, "/") {
+		gui.TunnelsPath += "/"
+	}
+
 	if err := gui.Settings.Load(); err != nil {
 		log.Error().Err(err).Msg("error initial settings load")
 	}

package_deb.sh

@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 echo "wireguird: cleaning..."
 
 deb_file="./build/wireguird_amd64.deb"
@@ -13,17 +15,15 @@ fi
 mkdir -p "$opt_w_dir"
 
 echo "wireguird: building go binary..."
-time {
   go generate
   go build -ldflags "-s -w" -trimpath -o "$opt_w_dir""wireguird"
-}
 
 echo "wireguird: copying icons..."
 cp -r ./Icon/ "$opt_w_dir"
 
 echo "wireguird: building deb package..."
 
-touch "$opt_w_dir""wireguird.settings"
+echo '{"MultipleTunnels":false,"StartOnTray":false,"CheckUpdates":false,"TunnelsPath":"/etc/wireguard","Debug":false}' > "$opt_w_dir""wireguird.settings"
 
 if [ ! -d "./build/" ]; then
   mkdir ./build/

settings/settings.go

@@ -3,18 +3,19 @@ package settings
 import (
 	"encoding/json"
 	"io/ioutil"
+	"os"
+	"path/filepath"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/ungerik/go-dry"
 )
 
-const FilePath = "./wireguird.settings"
-
 type Settings struct {
 	MultipleTunnels bool
 	StartOnTray     bool
 	CheckUpdates    bool
+	TunnelsPath     string
 	Debug           bool
 }
 
@@ -23,11 +24,19 @@ var (
 	checkUpdates    *bool
 	debug           *bool
 	tray            *bool
+	filePath        string
 )
 
 func (s *Settings) Init() error {
 	log.Debug().Msg("Settings init")
 
+	exePath, err := os.Executable()
+	if err != nil {
+		return err
+	}
+
+	filePath = filepath.Join(filepath.Dir(exePath), "wireguird.settings")
+
 	if err := s.Load(); err != nil {
 		return err
 	}
@@ -48,7 +57,7 @@ func (s *Settings) Save() error {
 		return err
 	}
 
-	if err := ioutil.WriteFile(FilePath, data, 0660); err != nil {
+	if err := ioutil.WriteFile(filePath, data, 0666); err != nil {
 		return err
 	}
 
@@ -58,12 +67,12 @@ func (s *Settings) Save() error {
 
 func (s *Settings) Load() error {
 	log.Debug().Msg("loading settings")
-	if !dry.FileExists(FilePath) {
+	if !dry.FileExists(filePath) {
 		log.Debug().Msg("settings file doesnt exist")
 		return nil
 	}
 
-	data, err := ioutil.ReadFile(FilePath)
+	data, err := ioutil.ReadFile(filePath)
 	if err != nil {
 		return err
 	}