clients/android: handle missing keystore.properties in docker-based build

0 views
Skip to first unread message

nor...@perkeep.org

unread,
Jun 17, 2022, 10:47:05 AM6/17/22
to camlistor...@googlegroups.com


https://github.com/perkeep/perkeep/commit/60bd47b272be943b3843384c10dc76a5ac77b0e1

commit 60bd47b272be943b3843384c10dc76a5ac77b0e1
Author: Sebastien Binet <bi...@cern.ch>
Date: Wed Jun 1 13:54:06 2022 +0200

clients/android: handle missing keystore.properties in docker-based build

Signed-off-by: Sebastien Binet <bi...@cern.ch>

diff --git a/clients/android/build-in-docker.go b/clients/android/build-in-docker.go
index 3801ef8..6dec38e 100755
--- a/clients/android/build-in-docker.go
+++ b/clients/android/build-in-docker.go
@@ -65,8 +65,22 @@ func buildApp() {
}
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
- if err := cmd.Run(); err != nil {
- log.Fatalf("Error building Android app: %v", err)
+
+ if _, err := os.ReadFile("./keystore.properties"); err != nil {
+ // no keystore.
+ // generate one that's in line with the one from devenv/Dockerfile.
+
+ const keystore = `## Code generated by perkeep; DO NOT EDIT.
+storeFile=/home/gopher/keystore
+storePassword=gopher
+keyAlias=perkeep
+keyPassword=gopher
+`
+ err = os.WriteFile("./keystore.properties", []byte(keystore), 0644)
+ if err != nil {
+ log.Fatalf("could not write default keystore.properties: %+v", err)
+ }
+ defer os.Remove("./keystore.properties")
}
}

Reply all
Reply to author
Forward
0 new messages