Compare commits

..

6 Commits

Author SHA1 Message Date
Lea Anthony
ed2da4c349 v1.12.0 2021-03-27 00:27:17 +11:00
Lea Anthony
1a7e762564 v1.12.0-pre6 2021-03-27 00:21:33 +11:00
Lea Anthony
cb16ad1938 Add hi019 to CONTRIBUTORS 2021-03-26 17:02:54 +11:00
hi019
779095c988 feat(cli): use gitconfig name as name prompt default value 2021-03-26 17:00:51 +11:00
hi019
eb7349efbc fix: typo in comment (#627) 2021-03-25 05:56:54 +11:00
Travis McLane
1b5ac3d2b6 update scripts/build.sh to run test only on v1 2021-03-20 15:02:00 +11:00
5 changed files with 16 additions and 5 deletions

View File

@@ -44,4 +44,5 @@ Wails is what it is because of the time and effort given by these great people.
* [SophieAu](https://github.com/SophieAu)
* [Alexander Matviychuk](https://github.com/alexmat)
* [RH12503](https://github.com/RH12503)
* [hi019](https://github.com/hi019)

View File

@@ -595,3 +595,9 @@ func ldFlags(po *ProjectOptions, buildMode string) string {
}
return ldflags
}
func getGitConfigValue(key string) (string, error) {
output, err := exec.Command("git", "config", "--get", "--null", key).Output()
// When using --null git appends a null character (\u0000) to the command output
return strings.TrimRight(string(output), "\u0000"), err
}

View File

@@ -99,11 +99,16 @@ func (s *SystemHelper) setup() error {
if config.Name != "" {
systemConfig["name"] = PromptRequired("What is your name", config.Name)
} else if n, err := getGitConfigValue("user.name"); err == nil && n != "" {
systemConfig["name"] = PromptRequired("What is your name", n)
} else {
systemConfig["name"] = PromptRequired("What is your name")
}
if config.Email != "" {
systemConfig["email"] = PromptRequired("What is your email address", config.Email)
} else if e, err := getGitConfigValue("user.email"); err == nil && e != "" {
systemConfig["email"] = PromptRequired("What is your email address", e)
} else {
systemConfig["email"] = PromptRequired("What is your email address")
}
@@ -180,7 +185,7 @@ func (s *SystemHelper) Initialise() error {
return s.setup()
}
// SystemConfig - Defines system wode configuration data
// SystemConfig - Defines system wide configuration data
type SystemConfig struct {
Name string `json:"name"`
Email string `json:"email"`

View File

@@ -1,5 +1,4 @@
package cmd
// Version - Wails version
const Version = "v1.12.0-pre5"
const Version = "v1.12.0"

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash
echo "**** Checking if Wails passes unit tests ****"
if ! go test ./...
if ! go test ./lib/... ./runtime/... ./cmd/...
then
echo ""
echo "ERROR: Unit tests failed!"