Fix various gofmt issues

Not sure how some of these crept in.
This commit is contained in:
Menno Finlay-Smits 2019-03-12 14:26:38 +13:00
parent 043dc161ce
commit 7e248cb1d4
4 changed files with 20 additions and 20 deletions

View File

@ -5,18 +5,18 @@ package main
import ( import (
"bufio" "bufio"
"errors" "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" "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" const Version = "VERSION"
@ -116,7 +116,7 @@ func createRegistryKeysForUninstaller(installDir string, isUserInstall bool) {
func updateVersionInRegistry(isUserInstall bool) { func updateVersionInRegistry(isUserInstall bool) {
regRoot := getRegistryRoot(isUserInstall) regRoot := getRegistryRoot(isUserInstall)
updateKey := `Software\Aminal\Update\Clients\` + ProductId updateKey := `Software\Aminal\Update\Clients\` + ProductId
writeRegStr(regRoot, updateKey, "pv", Version + ".0") writeRegStr(regRoot, updateKey, "pv", Version+".0")
writeRegStr(regRoot, updateKey, "name", "Aminal") 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) { 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) key, _, err := registry.CreateKey(regRoot, keyPath, mode)
check(err) check(err)
defer key.Close() defer key.Close()

View File

@ -19,6 +19,7 @@ package main
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/liamg/aminal/windows/winutil"
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
@ -26,7 +27,6 @@ import (
"sort" "sort"
"strconv" "strconv"
"strings" "strings"
"github.com/liamg/aminal/windows/winutil"
) )
type Version struct { type Version struct {