From 7e248cb1d40c51299b740ace87f853496f3d32b0 Mon Sep 17 00:00:00 2001
From: Menno Finlay-Smits <inbox@menno.io>
Date: Tue, 12 Mar 2019 14:26:38 +1300
Subject: [PATCH] Fix various gofmt issues

Not sure how some of these crept in.
---
 terminal/terminal.go           |  2 +-
 windows/installer/installer.go | 30 +++++++++++++++---------------
 windows/launcher/launcher.go   |  6 +++---
 windows/winutil/winutil.go     |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/terminal/terminal.go b/terminal/terminal.go
index 989ebd9..482cdc5 100644
--- a/terminal/terminal.go
+++ b/terminal/terminal.go
@@ -85,7 +85,7 @@ func New(pty platform.Pty, logger *zap.SugaredLogger, config *config.Config) *Te
 			ShowCursor: true,
 		},
 		platformDependentSettings: pty.GetPlatformDependentSettings(),
-		dirty: newNotifier(),
+		dirty:                     newNotifier(),
 	}
 	t.buffers = []*buffer.Buffer{
 		buffer.NewBuffer(t.terminalState, t.dirty),
diff --git a/windows/installer/installer.go b/windows/installer/installer.go
index 1d47f4b..9aba6d7 100644
--- a/windows/installer/installer.go
+++ b/windows/installer/installer.go
@@ -5,18 +5,18 @@ package main
 import (
 	"bufio"
 	"errors"
-	"golang.org/x/sys/windows/registry"
-	"os"
-	"os/user"
-	"strings"
-	"path/filepath"
-	"github.com/liamg/aminal/windows/winutil"
-	"github.com/liamg/aminal/generated-src/installer/data"
-	"text/template"
-	"io/ioutil"
-	"os/exec"
-	"syscall"
 	"flag"
+	"github.com/liamg/aminal/generated-src/installer/data"
+	"github.com/liamg/aminal/windows/winutil"
+	"golang.org/x/sys/windows/registry"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"os/user"
+	"path/filepath"
+	"strings"
+	"syscall"
+	"text/template"
 )
 
 const Version = "VERSION"
@@ -116,7 +116,7 @@ func createRegistryKeysForUninstaller(installDir string, isUserInstall bool) {
 func updateVersionInRegistry(isUserInstall bool) {
 	regRoot := getRegistryRoot(isUserInstall)
 	updateKey := `Software\Aminal\Update\Clients\` + ProductId
-	writeRegStr(regRoot, updateKey, "pv", Version + ".0")
+	writeRegStr(regRoot, updateKey, "pv", Version+".0")
 	writeRegStr(regRoot, updateKey, "name", "Aminal")
 }
 
@@ -128,7 +128,7 @@ func getRegistryRoot(isUserInstall bool) registry.Key {
 }
 
 func writeRegStr(regRoot registry.Key, keyPath string, valueName string, value string) {
-	const mode = registry.WRITE|registry.WOW64_32KEY
+	const mode = registry.WRITE | registry.WOW64_32KEY
 	key, _, err := registry.CreateKey(regRoot, keyPath, mode)
 	check(err)
 	defer key.Close()
@@ -154,7 +154,7 @@ func getStartMenuDir(isUserInstall bool) string {
 
 func createShortcut(linkPath, targetPath string) {
 	type Shortcut struct {
-		LinkPath string
+		LinkPath   string
 		TargetPath string
 	}
 	tmpl := template.New("createLnk.vbs")
@@ -215,4 +215,4 @@ func check(e error) {
 	if e != nil {
 		panic(e)
 	}
-}
\ No newline at end of file
+}
diff --git a/windows/launcher/launcher.go b/windows/launcher/launcher.go
index 73da185..cd5cc5f 100644
--- a/windows/launcher/launcher.go
+++ b/windows/launcher/launcher.go
@@ -19,6 +19,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"github.com/liamg/aminal/windows/winutil"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -26,12 +27,11 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"github.com/liamg/aminal/windows/winutil"
 )
 
 type Version struct {
 	number [3]int
-	name string
+	name   string
 }
 type Versions []Version
 
@@ -121,4 +121,4 @@ func check(e error) {
 	if e != nil {
 		panic(e)
 	}
-}
\ No newline at end of file
+}
diff --git a/windows/winutil/winutil.go b/windows/winutil/winutil.go
index 99e7c5b..7536aaa 100644
--- a/windows/winutil/winutil.go
+++ b/windows/winutil/winutil.go
@@ -24,4 +24,4 @@ func GetExecutablePath() (string, error) {
 		return "", e1
 	}
 	return string(utf16.Decode(b[0:n])), nil
-}
\ No newline at end of file
+}