55package zip
66
77import (
8+ "archive/zip"
89 "fmt"
910 "os"
1011 "os/exec"
1112 "path/filepath"
12- "strings"
1313
1414 "github.com/elastic/beats/v7/x-pack/agent/pkg/agent/errors"
1515 "github.com/elastic/beats/v7/x-pack/agent/pkg/artifact"
@@ -35,37 +35,72 @@ func NewInstaller(config *artifact.Config) (*Installer, error) {
3535// Install performs installation of program in a specific version.
3636// It expects package to be already downloaded.
3737func (i * Installer ) Install (programName , version , installDir string ) error {
38- if err := i .unzip (programName , version , installDir ); err != nil {
38+ artifactPath , err := artifact .GetArtifactPath (programName , version , i .config .OS (), i .config .Arch (), i .config .TargetDirectory )
39+ if err != nil {
3940 return err
4041 }
4142
42- oldPath := filepath .Join (installDir , fmt .Sprintf ("%s-%s-windows" , programName , version ))
43- newPath := filepath .Join (installDir , strings .Title (programName ))
44- if err := os .Rename (oldPath , newPath ); err != nil {
45- return errors .New (err , errors .TypeFilesystem , errors .M (errors .MetaKeyPath , newPath ))
43+ if err := i .unzip (artifactPath , programName , version ); err != nil {
44+ return err
4645 }
4746
48- return i .runInstall (programName , installDir )
49- }
50-
51- func (i * Installer ) unzip (programName , version , installPath string ) error {
52- artifactPath , err := artifact .GetArtifactPath (programName , version , i .config .OS (), i .config .Arch (), i .config .TargetDirectory )
47+ rootDir , err := i .getRootDir (artifactPath )
5348 if err != nil {
5449 return err
5550 }
5651
52+ // if root directory is not the same as desired directory rename
53+ // e.g contains `-windows-` or `-SNAPSHOT-`
54+ if rootDir != installDir {
55+ if err := os .Rename (rootDir , installDir ); err != nil {
56+ return errors .New (err , errors .TypeFilesystem , errors .M (errors .MetaKeyPath , installDir ))
57+ }
58+ }
59+
60+ return i .runInstall (programName , version , installDir )
61+ }
62+
63+ func (i * Installer ) unzip (artifactPath , programName , version string ) error {
5764 if _ , err := os .Stat (artifactPath ); err != nil {
5865 return errors .New (fmt .Sprintf ("artifact for '%s' version '%s' could not be found at '%s'" , programName , version , artifactPath ), errors .TypeFilesystem , errors .M (errors .MetaKeyPath , artifactPath ))
5966 }
6067
61- powershellArg := fmt .Sprintf ("Expand-Archive -Path \" %s\" -DestinationPath \" %s\" " , artifactPath , installPath )
68+ powershellArg := fmt .Sprintf ("Expand-Archive -LiteralPath \" %s\" -DestinationPath \" %s\" " , artifactPath , i . config . InstallPath )
6269 installCmd := exec .Command ("powershell" , "-command" , powershellArg )
6370 return installCmd .Run ()
6471}
6572
66- func (i * Installer ) runInstall (programName , installPath string ) error {
73+ func (i * Installer ) runInstall (programName , version , installPath string ) error {
6774 powershellCmd := fmt .Sprintf (powershellCmdTemplate , installPath , programName )
68-
6975 installCmd := exec .Command ("powershell" , "-command" , powershellCmd )
76+
7077 return installCmd .Run ()
7178}
79+
80+ // retrieves root directory from zip archive
81+ func (i * Installer ) getRootDir (zipPath string ) (dir string , err error ) {
82+ defer func () {
83+ if dir != "" {
84+ dir = filepath .Join (i .config .InstallPath , dir )
85+ }
86+ }()
87+
88+ zipReader , err := zip .OpenReader (zipPath )
89+ if err != nil {
90+ return "" , err
91+ }
92+ defer zipReader .Close ()
93+
94+ var rootDir string
95+ for _ , f := range zipReader .File {
96+ if filepath .Base (f .Name ) == filepath .Dir (f .Name ) {
97+ return f .Name , nil
98+ }
99+
100+ if currentDir := filepath .Dir (f .Name ); rootDir == "" || len (currentDir ) < len (rootDir ) {
101+ rootDir = currentDir
102+ }
103+ }
104+
105+ return rootDir , nil
106+ }
0 commit comments