diff --git a/client-config.go b/client-config.go index 4824c14..3fa6bdf 100644 --- a/client-config.go +++ b/client-config.go @@ -15,21 +15,21 @@ import ( ) type ClientConfig struct { - ClientName *string `yaml:"clientName"` - ClientDisplayName *string `yaml:"clientDisplayName"` - Command *string `yaml:"command"` - CommandArgs *string `yaml:"commandArgs"` - StopCommand *string `yaml:"stopCommand"` - Delay *string `yaml:"delay"` - Start *bool `yaml:"start"` - NoShellService *bool `yaml:"noShellService"` - CommandInPath *bool `yaml:"commandInPath"` - Executable *string `yaml:"executable"` - ExtendClassPath string `yaml:"-"` - JavaShellService *string `yaml:"javaShellService"` - NoAutoSuffixWindows *bool `yaml:"noAutoSuffixWindows"` - TargetOS *string `yaml:"targetOS"` - ResourceDir *string `yaml:"resourceDir"` + ClientName *string `yaml:"clientName,omitempty"` + ClientDisplayName *string `yaml:"clientDisplayName,omitempty"` + Command *string `yaml:"command,omitempty,omitempty"` + CommandArgs *string `yaml:"commandArgs,omitempty"` + StopCommand *string `yaml:"stopCommand,omitempty"` + Delay *string `yaml:"delay,omitempty"` + Start *bool `yaml:"start,omitempty"` + NoShellService *bool `yaml:"noShellService,omitempty"` + CommandInPath *bool `yaml:"commandInPath,omitempty"` + Executable *string `yaml:"executable,omitempty"` + ExtendClassPath string `yaml:"-,omitempty"` + JavaShellService *string `yaml:"javaShellService,omitempty"` + NoAutoSuffixWindows *bool `yaml:"noAutoSuffixWindows,omitempty"` + TargetOS *string `yaml:"targetOS,omitempty"` + ResourceDir *string `yaml:"resourceDir,omitempty"` } func karenConfig() string { diff --git a/plugin-config.go b/plugin-config.go index e008a19..b539163 100644 --- a/plugin-config.go +++ b/plugin-config.go @@ -18,36 +18,36 @@ import ( ) type PluginConfig struct { - PluginName *string `yaml:"name"` - KeyName *string `yaml:"key"` - Signer *string `yaml:"signer"` - Version *string `yaml:"version"` - License *string `yaml:"license"` - Date *string `yaml:"date"` - Author *string `yaml:"author"` - Website *string `yaml:"website"` - UpdateURL *string `yaml:"updateURL"` - Description *string `yaml:"description"` - DescriptionLang []*string `yaml:"descriptionLang"` - ConsoleLinkName *string `yaml:"consoleLinkName"` - ConsoleLinkNameLang []*string `yaml:"consoleLinkNameLang"` - ConsoleLinkURL *string `yaml:"consoleLinkURL"` - ConsoleIcon *string `yaml:"consoleIcon"` - ConsoleIconCode *string `yaml:"consoleIconCode"` - MinVersion *string `yaml:"minVersion"` - MaxVerion *string `yaml:"maxVersion"` - MinJava *string `yaml:"minJava"` - MinJetty *string `yaml:"minJetty"` - MaxJetty *string `yaml:"maxJetty"` - NoStop *bool `yaml:"disableStop"` - NoStart *bool `yaml:"dont-start-at-install"` - Restart *bool `yaml:"restart-at-install"` - OnlyUpdate *bool `yaml:"only-update"` - OnlyInstall *bool `yaml:"only-install"` - ConsoleLinkTip *string `yaml:"consoleLinkTip"` - ConsoleLinkTipLang []*string `yaml:"consoleLinkTipLang"` - SignerDirectory *string `yaml:"signerDirectory"` - FileType *int `yaml:"fileType"` + PluginName *string `yaml:"name,omitempty"` + KeyName *string `yaml:"key,omitempty"` + Signer *string `yaml:"signer,omitempty"` + Version *string `yaml:"version,omitempty"` + License *string `yaml:"license,omitempty"` + Date *string `yaml:"date,omitempty"` + Author *string `yaml:"author,omitempty"` + Website *string `yaml:"website,omitempty"` + UpdateURL *string `yaml:"updateURL,omitempty"` + Description *string `yaml:"description,omitempty"` + DescriptionLang []*string `yaml:"descriptionLang,omitempty"` + ConsoleLinkName *string `yaml:"consoleLinkName,omitempty"` + ConsoleLinkNameLang []*string `yaml:"consoleLinkNameLang,omitempty"` + ConsoleLinkURL *string `yaml:"consoleLinkURL,omitempty"` + ConsoleIcon *string `yaml:"consoleIcon,omitempty"` + ConsoleIconCode *string `yaml:"consoleIconCode,omitempty"` + MinVersion *string `yaml:"minVersion,omitempty"` + MaxVerion *string `yaml:"maxVersion,omitempty"` + MinJava *string `yaml:"minJava,omitempty"` + MinJetty *string `yaml:"minJetty,omitempty"` + MaxJetty *string `yaml:"maxJetty,omitempty"` + NoStop *bool `yaml:"disableStop,omitempty"` + NoStart *bool `yaml:"dont-start-at-install,omitempty"` + Restart *bool `yaml:"restart-at-install,omitempty"` + OnlyUpdate *bool `yaml:"only-update,omitempty"` + OnlyInstall *bool `yaml:"only-install,omitempty"` + ConsoleLinkTip *string `yaml:"consoleLinkTip,omitempty"` + ConsoleLinkTipLang []*string `yaml:"consoleLinkTipLang,omitempty"` + SignerDirectory *string `yaml:"signerDirectory,omitempty"` + FileType *int `yaml:"fileType,omitempty"` } func (pc *PluginConfig) Print() string { @@ -79,7 +79,8 @@ func (pc *PluginConfig) Print() string { r += pc.PrintOnlyInstall() //25 r += pc.PrintConsoleLinkTip() //26 //27 - return Replace(r) + //return Replace(r) + return r } func (pc *PluginConfig) PrintPluginName() string {