Skip to content

Commit 54b7c8e

Browse files
Gjergjmmeloni
authored andcommitted
chore(cmd/immuadmin/command/service): syntax error, fail build on windows
1 parent a400193 commit 54b7c8e

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

cmd/immuadmin/command/service/helper_windows.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ func CheckPrivileges() (bool, error) {
7979
return false, ErrUnsupportedSystem
8080
}
8181

82-
func InstallSetup(serviceName string) (err error) {
83-
if err = installConfig(serviceName); err != nil {
82+
func InstallSetup(serviceName string, vip *viper.Viper) (err error) {
83+
if err = installConfig(serviceName, vip); err != nil {
8484
return err
8585
}
8686
return err
8787
}
8888

89-
func UninstallSetup(serviceName string) (err error) {
89+
func UninstallSetup(serviceName string, vip *viper.Viper) (err error) {
9090
// remove ProgramFiles folder only if it is empty
9191
var cep string
9292
if cep, err = getCommonExecPath(); err != nil {
@@ -122,9 +122,9 @@ func UninstallSetup(serviceName string) (err error) {
122122
return err
123123
}
124124

125-
func installConfig(serviceName string) (err error) {
125+
func installConfig(serviceName string, vip *viper.Viper) (err error) {
126126
var cp string
127-
if err = readConfig(serviceName); err != nil {
127+
if err = readConfig(serviceName, vip); err != nil {
128128
return err
129129
}
130130

@@ -140,9 +140,9 @@ func installConfig(serviceName string) (err error) {
140140
}
141141

142142
// RemoveProgramFiles remove all program files
143-
func RemoveProgramFiles(serviceName string) (err error) {
143+
func RemoveProgramFiles(serviceName string, vip *viper.Viper) (err error) {
144144
var path string
145-
if err = readConfig(serviceName); err != nil {
145+
if err = readConfig(serviceName, vip); err != nil {
146146
return err
147147
}
148148
if path, err = helper.ResolvePath(filepath.Join(filepath.FromSlash(viper.GetString("dir")), "config"), false); err != nil {
@@ -152,8 +152,8 @@ func RemoveProgramFiles(serviceName string) (err error) {
152152
}
153153

154154
// EraseData erase all data
155-
func EraseData(serviceName string) (err error) {
156-
if err = readConfig(serviceName); err != nil {
155+
func EraseData(serviceName string, vip *viper.Viper) (err error) {
156+
if err = readConfig(serviceName, vip); err != nil {
157157
return err
158158
}
159159
var path string
@@ -269,7 +269,7 @@ func IsRunning(status string) bool {
269269
return status == "Status: SERVICE_RUNNING"
270270
}
271271

272-
func readConfig(serviceName string) (err error) {
272+
func readConfig(serviceName string, vip *viper.Viper) (err error) {
273273
viper.SetConfigType("toml")
274274
return viper.ReadConfig(bytes.NewBuffer(configsMap[serviceName]))
275275
}

0 commit comments

Comments
 (0)