From c9642be4caff0ae32abdcd56c391a36ea42a074e Mon Sep 17 00:00:00 2001 From: ialokim Date: Thu, 9 Sep 2021 13:20:34 +0200 Subject: [PATCH] add instructions for patch --- submodule-patch.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/submodule-patch.sh b/submodule-patch.sh index c9b21b871..f18e88da3 100755 --- a/submodule-patch.sh +++ b/submodule-patch.sh @@ -1,5 +1,14 @@ #!/bin/bash +# patch required to use briar as a gradle subproject (e.g. in brair-desktop): +# 1. git merge +# 2. git checkout --theirs . +# 3. git add . +# 4. git merge --continue +# 5. ./submodule-patch.sh +# 6. git add . +# 7. git commit -m "apply patch" + sed -i "s/':bramble-/':briar:bramble-/g" bramble-{android,core,java}/build.gradle sed -i "s/':bramble-/':briar:bramble-/g" briar-{android,core,api}/build.gradle -sed -i "s/':briar-/':briar:bria-/g" briar-{android,core,api}/build.gradle +sed -i "s/':briar-/':briar:briar-/g" briar-{android,core,api}/build.gradle