|
@@ -1,29 +1,24 @@
|
|
package apksigner
|
|
package apksigner
|
|
|
|
|
|
import (
|
|
import (
|
|
- "fmt"
|
|
|
|
"os"
|
|
"os"
|
|
"path/filepath"
|
|
"path/filepath"
|
|
"strconv"
|
|
"strconv"
|
|
"strings"
|
|
"strings"
|
|
|
|
|
|
- "notabug.org/Umnik/GoAndroidSDK/common/logger"
|
|
|
|
"notabug.org/Umnik/GoAndroidSDK/common/utils"
|
|
"notabug.org/Umnik/GoAndroidSDK/common/utils"
|
|
)
|
|
)
|
|
|
|
|
|
func getSingerNumber(line string) int {
|
|
func getSingerNumber(line string) int {
|
|
if !strings.Contains(line, "Signer #") {
|
|
if !strings.Contains(line, "Signer #") {
|
|
- log.Warn(fmt.Errorf("signer number not found"))
|
|
|
|
return -1
|
|
return -1
|
|
}
|
|
}
|
|
part := strings.SplitN(line, " ", 3)[1]
|
|
part := strings.SplitN(line, " ", 3)[1]
|
|
if !strings.HasPrefix(part, "#") {
|
|
if !strings.HasPrefix(part, "#") {
|
|
- log.Warn(fmt.Errorf("expected \"#X\" but got \"%s\"", part))
|
|
|
|
return -1
|
|
return -1
|
|
}
|
|
}
|
|
res, err := strconv.Atoi(strings.Trim(part, "#"))
|
|
res, err := strconv.Atoi(strings.Trim(part, "#"))
|
|
if err != nil {
|
|
if err != nil {
|
|
- log.Warn(err)
|
|
|
|
return -1
|
|
return -1
|
|
}
|
|
}
|
|
return res
|
|
return res
|
|
@@ -43,11 +38,11 @@ func getNotProtectedFile(line string) string {
|
|
return strings.TrimSpace(strings.SplitN(utils.TwoSpotValue(line), " ", 2)[0])
|
|
return strings.TrimSpace(strings.SplitN(utils.TwoSpotValue(line), " ", 2)[0])
|
|
}
|
|
}
|
|
|
|
|
|
-var log = logger.NewLogger("[FATAL] ")
|
|
|
|
-
|
|
|
|
func apksignerFromPath(dirPath string) Apksigner {
|
|
func apksignerFromPath(dirPath string) Apksigner {
|
|
binPath := filepath.Join(dirPath, "apksigner")
|
|
binPath := filepath.Join(dirPath, "apksigner")
|
|
_, err := os.Stat(binPath)
|
|
_, err := os.Stat(binPath)
|
|
- log.Fatal(err)
|
|
|
|
|
|
+ if err != nil {
|
|
|
|
+ panic(err)
|
|
|
|
+ }
|
|
return Apksigner{binPath: binPath}
|
|
return Apksigner{binPath: binPath}
|
|
}
|
|
}
|