@@ -201,28 +201,18 @@ func (mph *MavenPackageHandler) installMavenGavReader() (err error) {
201
201
return fmt .Errorf ("failed to create a temp %s file: \n %s" , mavenGavReader , err .Error ())
202
202
}
203
203
defer func () {
204
- closeError := mavenGavReaderFile .Close ()
205
- deleteError := os .Remove (mavenGavReaderFile .Name ())
206
- if err == nil {
207
- err = closeError
208
- if err == nil {
209
- err = deleteError
210
- }
211
- }
204
+ err = errors .Join (err , mavenGavReaderFile .Close (), os .Remove (mavenGavReaderFile .Name ()))
212
205
}()
213
206
gavReaderFolder := path .Dir (mavenGavReaderFile .Name ())
214
207
currentWd , err := os .Getwd ()
215
208
if err != nil {
216
209
return
217
210
}
218
211
if err = os .Chdir (gavReaderFolder ); err != nil {
219
- return err
212
+ return fmt . Errorf ( "failed to change dir to the maven gav reader temp dir: \n %w" , err )
220
213
}
221
214
defer func () {
222
- e := os .Chdir (currentWd )
223
- if err == nil {
224
- err = e
225
- }
215
+ err = errors .Join (err , os .Chdir (currentWd ))
226
216
}()
227
217
228
218
if _ , err = mavenGavReaderFile .Write (mavenGavReaderContent ); err != nil {
@@ -231,7 +221,7 @@ func (mph *MavenPackageHandler) installMavenGavReader() (err error) {
231
221
// Install the plugin
232
222
var output []byte
233
223
installProperties := []string {"org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file" , "-Dfile=" + mavenGavReaderFile .Name ()}
234
- if output , err = exec . Command ( "mvn" , installProperties ... ). CombinedOutput ( ); err != nil {
224
+ if output , err = mph . runMvnCommand ( installProperties ); err != nil {
235
225
return fmt .Errorf ("failed to install the maven-gav-reader plugin. Maven output: %s\n Error received:\n %s" , string (output ), err .Error ())
236
226
}
237
227
mph .isMavenGavReaderInstalled = true
0 commit comments