Skip to content

Commit b8ee0ab

Browse files
authored
Download maven-gav-reader with JF_DEPS_REPO (#502)
1 parent b230d2b commit b8ee0ab

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

packagehandlers/mavenpackagehandler.go

+4-14
Original file line numberDiff line numberDiff line change
@@ -201,28 +201,18 @@ func (mph *MavenPackageHandler) installMavenGavReader() (err error) {
201201
return fmt.Errorf("failed to create a temp %s file: \n%s", mavenGavReader, err.Error())
202202
}
203203
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()))
212205
}()
213206
gavReaderFolder := path.Dir(mavenGavReaderFile.Name())
214207
currentWd, err := os.Getwd()
215208
if err != nil {
216209
return
217210
}
218211
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)
220213
}
221214
defer func() {
222-
e := os.Chdir(currentWd)
223-
if err == nil {
224-
err = e
225-
}
215+
err = errors.Join(err, os.Chdir(currentWd))
226216
}()
227217

228218
if _, err = mavenGavReaderFile.Write(mavenGavReaderContent); err != nil {
@@ -231,7 +221,7 @@ func (mph *MavenPackageHandler) installMavenGavReader() (err error) {
231221
// Install the plugin
232222
var output []byte
233223
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 {
235225
return fmt.Errorf("failed to install the maven-gav-reader plugin. Maven output: %s\n Error received:\n%s", string(output), err.Error())
236226
}
237227
mph.isMavenGavReaderInstalled = true

0 commit comments

Comments
 (0)