Remove signature with vanilla zip (#59)

* Use zip to remove items from apk as aapt seems to be generating corrupt zip

* Find and print zip tool's full path

main.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"strings"
@@ -143,7 +144,7 @@ func filterMETAFiles(fileList []string) []string {
 }
 
 func filterSigningFiles(fileList []string) []string {
-	signingFiles := []string{}
+	var signingFiles []string
 	for _, file := range fileList {
 		ext := filepath.Ext(file)
 		for _, signExt := range signingFileExts {
@@ -155,8 +156,8 @@ func filterSigningFiles(fileList []string) []string {
 	return signingFiles
 }
 
-func removeFilesFromBuildArtifact(aapt, pth string, files []string) error {
-	cmdSlice := append([]string{aapt, "remove", pth}, files...)
+func removeFilesFromBuildArtifact(zip, pth string, files []string) error {
+	cmdSlice := append([]string{zip, "-d", pth}, files...)
 
 	prinatableCmd := command.PrintableCommandArgs(false, cmdSlice)
 	log.Printf("=> %s", prinatableCmd)
@@ -185,7 +186,7 @@ func isBuildArtifactSigned(aapt, pth string) (bool, error) {
 	return false, nil
 }
 
-func unsignBuildArtifact(aapt, pth string) error {
+func unsignBuildArtifact(zip, aapt, pth string) error {
 	filesInBuildArtifact, err := listFilesInBuildArtifact(aapt, pth)
 	if err != nil {
 		return err
@@ -199,7 +200,7 @@ func unsignBuildArtifact(aapt, pth string) error {
 		return nil
 	}
 
-	return removeFilesFromBuildArtifact(aapt, pth, signingFiles)
+	return removeFilesFromBuildArtifact(zip, pth, signingFiles)
 }
 
 func prettyBuildArtifactBasename(buildArtifactPth string) string {
@@ -307,6 +308,12 @@ func main() {
 	if err != nil {
 		failf("Failed to create keystore helper, error: %s", err)
 	}
+
+	zip, err := exec.LookPath("zip")
+	if err != nil {
+		failf("Failed to find zip path, error: %s", err)
+	}
+	log.Printf("zip: %s", zip)
 	// ---
 
 	// Sign build artifacts
@@ -344,7 +351,7 @@ func main() {
 
 		if isSigned {
 			log.Printf("Signature file (DSA or RSA) found in META-INF, unsigning the build artifact...")
-			if err := unsignBuildArtifact(aapt, unsignedBuildArtifactPth); err != nil {
+			if err := unsignBuildArtifact(zip, aapt, unsignedBuildArtifactPth); err != nil {
 				failf("Failed to unsign Build Artifact, error: %s", err)
 			}
 			fmt.Println()
@@ -357,7 +364,7 @@ func main() {
 			fullPath := signJarSigner(zipalign, tmpDir, unsignedBuildArtifactPth, buildArtifactDir, buildArtifactBasename, artifactExt, cfg.PrivateKeyPassword, cfg.OutputName, keystore, pageAlignConfig)
 			signedAABPaths = append(signedAABPaths, fullPath)
 		} else if cfg.UseAPKSigner {
-			fullPath := signAPK(zipalign, tmpDir, unsignedBuildArtifactPth, buildArtifactDir, buildArtifactBasename, artifactExt, cfg.OutputName, apkSigner, pageAlignConfig)
+			fullPath := signAPK(zipalign, unsignedBuildArtifactPth, buildArtifactDir, buildArtifactBasename, artifactExt, cfg.OutputName, apkSigner, pageAlignConfig)
 			signedAPKPaths = append(signedAPKPaths, fullPath)
 		} else {
 			fullPath := signJarSigner(zipalign, tmpDir, unsignedBuildArtifactPth, buildArtifactDir, buildArtifactBasename, artifactExt, cfg.PrivateKeyPassword, cfg.OutputName, keystore, pageAlignConfig)
@@ -414,7 +421,7 @@ func signJarSigner(zipalign, tmpDir string, unsignedBuildArtifactPth string, bui
 	return fullPath
 }
 
-func signAPK(zipalign, tmpDir string, unsignedBuildArtifactPth string, buildArtifactDir string, buildArtifactBasename string, artifactExt string, outputName string, apkSigner SignatureConfiguration, pageAlignConfig pageAlignStatus) string {
+func signAPK(zipalign, unsignedBuildArtifactPth, buildArtifactDir, buildArtifactBasename, artifactExt, outputName string, apkSigner SignatureConfiguration, pageAlignConfig pageAlignStatus) string {
 	alignedPath, err := zipAlignArtifact(zipalign, unsignedBuildArtifactPth, buildArtifactDir, buildArtifactBasename, artifactExt, "aligned", "", pageAlignConfig)
 	if err != nil {
 		failf("Failed to zipalign Build Artifact, error: %s", err)

step.yml

@@ -46,10 +46,9 @@ is_always_run: false
 is_skippable: false
 deps:
   brew:
-  - name: go
+  - name: zip
   apt_get:
-  - name: golang
-    bin_name: go
+  - name: zip
 toolkit:
   go:
     package_name: github.com/bitrise-steplib/steps-sign-apk