mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-08 04:08:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

put version in binary properly

Browse source
This commit is contained in:
tsmethurst 2021-06-28 12:14:54 +02:00
commit daa96eb247
9 changed files with 36 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/config/config.go
View file

@ -106,7 +106,7 @@ func loadFromFile(path string) (*Config, error) {
}
// ParseCLIFlags sets flags on the config using the provided Flags object
func (c *Config) ParseCLIFlags(f KeyedFlags) error {
func (c *Config) ParseCLIFlags(f KeyedFlags, version string) error {
fn := GetFlagNames()
// For all of these flags, we only want to set them on the config if:
@ -261,6 +261,8 @@ func (c *Config) ParseCLIFlags(f KeyedFlags) error {
c.AccountCLIFlags[EmailFlag] = f.String(EmailFlag)
c.AccountCLIFlags[PasswordFlag] = f.String(PasswordFlag)
c.SoftwareVersion = version
return nil
}

4
internal/config/default.go
View file

@ -1,7 +1,5 @@
package config
const softwareVersion = "0.1.0-SNAPSHOT"
// TestDefault returns a default config for testing
func TestDefault() *Config {
defaults := GetTestDefaults()
@ -121,7 +119,6 @@ func GetDefaults() Defaults {
ConfigPath: "",
Host: "",
Protocol: "https",
SoftwareVersion: softwareVersion,
DbType: "postgres",
DbAddress: "localhost",
@ -168,7 +165,6 @@ func GetTestDefaults() Defaults {
ConfigPath: "",
Host: "localhost:8080",
Protocol: "http",
SoftwareVersion: softwareVersion,
DbType: "postgres",
DbAddress: "localhost",