Merge pull request #333 from wttech/makeself-self-extraction

Makeself-self extraction

Author: krystian-panek-vmltech

pkg/common/filex/archive.go

@@ -1,10 +1,12 @@
 package filex
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/mholt/archiver/v3"
 	"github.com/samber/lo"
 	"github.com/wttech/aemc/pkg/common/pathx"
+	"io"
 	"os"
 	"path/filepath"
 )
@@ -82,3 +84,47 @@ func UnarchiveWithChanged(sourceFile, targetDir string) (bool, error) {
 	}
 	return true, nil
 }
+
+// UnarchiveMakeself extracts tar.gz archive from a Makeself self-extracting shell script.
+// Makeself (https://makeself.io/) creates self-extracting archives by embedding a tar.gz archive after a shell header.
+// This function finds the gzip magic bytes (0x1f 0x8b) and extracts everything after it.
+func UnarchiveMakeself(scriptPath string, targetDir string) error {
+	file, err := os.Open(scriptPath)
+	if err != nil {
+		return fmt.Errorf("cannot open Makeself script file '%s': %w", scriptPath, err)
+	}
+	defer file.Close()
+
+	// Read entire file to find embedded gzip archive
+	data, err := io.ReadAll(file)
+	if err != nil {
+		return fmt.Errorf("cannot read Makeself script file '%s': %w", scriptPath, err)
+	}
+
+	// Find gzip magic bytes (1f 8b) which mark the start of embedded tar.gz archive
+	gzipMagic := []byte{0x1f, 0x8b}
+	archiveStart := bytes.Index(data, gzipMagic)
+	if archiveStart == -1 {
+		return fmt.Errorf("cannot find gzip archive in Makeself script file '%s' (missing gzip magic bytes 0x1f 0x8b)", scriptPath)
+	}
+
+	// Extract archive data to temporary file as sibling of the script file
+	tmpFile, err := os.CreateTemp(filepath.Dir(scriptPath), filepath.Base(scriptPath)+"-*.tar.gz")
+	if err != nil {
+		return fmt.Errorf("cannot create temporary archive file in dir '%s' for Makeself extraction: %w", filepath.Dir(scriptPath), err)
+	}
+	tmpArchive := tmpFile.Name()
+	tmpFile.Close()
+	defer os.Remove(tmpArchive)
+
+	if err := os.WriteFile(tmpArchive, data[archiveStart:], 0644); err != nil {
+		return fmt.Errorf("cannot write extracted Makeself archive data to temporary file '%s': %w", tmpArchive, err)
+	}
+
+	// Unpack the tar.gz using standard archiver
+	if err := Unarchive(tmpArchive, targetDir); err != nil {
+		return fmt.Errorf("cannot unarchive extracted Makeself tar.gz '%s' to dir '%s': %w", tmpArchive, targetDir, err)
+	}
+
+	return nil
+}

pkg/sdk.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"github.com/samber/lo"
 	log "github.com/sirupsen/logrus"
-	"github.com/wttech/aemc/pkg/common/execx"
 	"github.com/wttech/aemc/pkg/common/filex"
 	"github.com/wttech/aemc/pkg/common/osx"
 	"github.com/wttech/aemc/pkg/common/pathx"
@@ -141,22 +140,22 @@ func (s SDK) unpackDispatcher() error {
 		}
 		log.Infof("unpacking SDK dispatcher tools ZIP '%s' to dir '%s'", zip, s.DispatcherDir())
 		err = filex.Unarchive(zip, s.DispatcherDir())
-		log.Infof("unpacked SDK dispatcher tools ZIP '%s' to dir '%s'", zip, s.DispatcherDir())
 		if err != nil {
 			return err
 		}
+		log.Infof("unpacked SDK dispatcher tools ZIP '%s' to dir '%s'", zip, s.DispatcherDir())
 	} else {
 		script, err := s.dispatcherToolsUnixScript()
 		if err != nil {
 			return err
 		}
-		log.Infof("unpacking SDK dispatcher tools using script '%s' to dir '%s'", script, s.DispatcherDir())
-		cmd := execx.CommandShell([]string{script, "--target", s.DispatcherDir()})
-		s.vendorManager.aem.CommandOutput(cmd)
-		if err := cmd.Run(); err != nil {
-			return fmt.Errorf("cannot run SDK dispatcher tools unpacking script '%s': %w", script, err)
+
+		log.Infof("extracting SDK dispatcher tools from Makeself script '%s' to dir '%s'", script, s.DispatcherDir())
+		if err := filex.UnarchiveMakeself(script, s.DispatcherDir()); err != nil {
+			return fmt.Errorf("cannot extract SDK dispatcher tools from self-extracting script '%s': %w", script, err)
 		}
-		log.Infof("unpacked SDK dispatcher tools using script '%s' to dir '%s'", script, s.DispatcherDir())
+		log.Infof("extracted SDK dispatcher tools from Makeself script '%s' to dir '%s'", script, s.DispatcherDir())
+
 	}
 	return nil
 }