Merge pull request #302 from andydotxyz/fix/290

andydotxyz · web-flow · commit 4b797ff97a6c · 2025-03-13T09:10:36.000Z
diff --git a/internal/command/android.go b/internal/command/android.go
@@ -199,7 +199,9 @@ func (cmd *android) setupContainerImages(flags *androidFlags, args []string) err
 			}
 		}
 
-		cmd.defaultContext.Keystore = volume.JoinPathContainer(cmd.defaultContext.Volume.WorkDirContainer(), flags.Keystore)
+		if flags.Keystore != "" {
+			cmd.defaultContext.Keystore = volume.JoinPathContainer(cmd.defaultContext.Volume.WorkDirContainer(), flags.Keystore)
+		}
 		cmd.defaultContext.KeystorePass = flags.KeystorePass
 		cmd.defaultContext.KeyPass = flags.KeyPass
 		cmd.defaultContext.KeyName = flags.KeyName

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,9 @@ func (cmd android) setupContainerImages(flags androidFlags, args []string) err`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`202`		`- cmd.defaultContext.Keystore = volume.JoinPathContainer(cmd.defaultContext.Volume.WorkDirContainer(), flags.Keystore)`
	`202`	`+ if flags.Keystore != "" {`
	`203`	`+ cmd.defaultContext.Keystore = volume.JoinPathContainer(cmd.defaultContext.Volume.WorkDirContainer(), flags.Keystore)`
	`204`	`+ }`
`203`	`205`	`cmd.defaultContext.KeystorePass = flags.KeystorePass`
`204`	`206`	`cmd.defaultContext.KeyPass = flags.KeyPass`
`205`	`207`	`cmd.defaultContext.KeyName = flags.KeyName`