From bea32af5d45702e5608d347bf2bf6314d899f2e0 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Sat, 12 Jan 2019 18:18:23 +0100
Subject: [feat] Reorganize code

Let's use a more structured folder system:
https://github.com/golang-standards/project-layout

- Resolves: #99
---
 standalone.go | 72 -----------------------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 standalone.go

(limited to 'standalone.go')

diff --git a/standalone.go b/standalone.go
deleted file mode 100644
index 0808da6..0000000
--- a/standalone.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// +build !bitmaskd
-// Copyright (C) 2018 LEAP
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package main
-
-import (
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-
-	"0xacab.org/leap/bitmask-systray/bitmask"
-	standalone "0xacab.org/leap/bitmask-systray/standalone"
-	pmautostart "github.com/ProtonMail/go-autostart"
-)
-
-const (
-	errorMsg = `An error has ocurred initializing %s: %v`
-)
-
-func initBitmask() (bitmask.Bitmask, error) {
-	b, err := standalone.Init()
-	if err != nil {
-		log.Printf("An error ocurred starting standalone bitmask: %v", err)
-		err = errors.New(printer.Sprintf(errorMsg, applicationName, err))
-	}
-	return b, err
-}
-
-func newAutostart(appName string, iconPath string) autostart {
-	exec := os.Args
-	if os.Getenv("SNAP") != "" {
-		re := regexp.MustCompile("/snap/([^/]*)/")
-		match := re.FindStringSubmatch(os.Args[0])
-		if len(match) > 1 {
-			snapName := match[1]
-			exec = []string{fmt.Sprintf("/snap/bin/%s.launcher", snapName)}
-		} else {
-			log.Printf("Snap binary has unknown path: %v", os.Args[0])
-		}
-	}
-
-	if exec[0][:2] == "./" || exec[0][:2] == ".\\" {
-		var err error
-		exec[0], err = filepath.Abs(exec[0])
-		if err != nil {
-			log.Printf("Error making the path absolute directory: %v", err)
-		}
-	}
-
-	return &pmautostart.App{
-		Name:        appName,
-		Exec:        exec,
-		DisplayName: appName,
-		Icon:        iconPath,
-	}
-}
-- 
cgit v1.2.3