From 7e7305c1be0f1028effb03f987096bcecc3fcc48 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 3 Mar 2015 21:19:07 -0800
Subject: [PATCH] I want to be able to switch dev machines without having to
 uninstall the latest debug build from my phones, and that requires using the
 same debug.keystore everywhere. So check one in, and add a script that
 symlinks to it from the machine's global location if necessary.

---
 xwords4/android/scripts/common_targets.xml |   3 +++
 xwords4/android/scripts/debug.keystore     | Bin 0 -> 1266 bytes
 xwords4/android/scripts/key-setup.sh       |  25 +++++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 xwords4/android/scripts/debug.keystore
 create mode 100755 xwords4/android/scripts/key-setup.sh

diff --git a/xwords4/android/scripts/common_targets.xml b/xwords4/android/scripts/common_targets.xml
index 41f105b0a..14be18b4d 100644
--- a/xwords4/android/scripts/common_targets.xml
+++ b/xwords4/android/scripts/common_targets.xml
@@ -16,6 +16,9 @@
     </target>
 
     <target name="my-pre-build">
+      <exec dir="." executable="../scripts/key-setup.sh"
+            failonerror="true"
+            />
         <exec dir="." executable="../scripts/ndksetup.sh" output="/dev/null"
               failonerror="true">
             <arg value="${build.target}"/>
diff --git a/xwords4/android/scripts/debug.keystore b/xwords4/android/scripts/debug.keystore
new file mode 100644
index 0000000000000000000000000000000000000000..5f1ac2c7b27fab51dc24c59e57cb05e1c5c9f364
GIT binary patch
literal 1266
zcmezO_TO6u1_mY|W&~sY#JrTE{LGY;)TGk%?9@u2xc6gSuQ;HZod!)zTMhWwxU|_A
zSs1mL1Q{7w8CaT_7EYUda|f&Ck|k5)w=vxReQdAU8^@&wqd%8)Ef>$*xHpdJ`rKlp
zr-79jn_Ui{*(v49f9#W{yVPI*Elxs7)<u82&uw{9r?T48@7Nv}z3N2&S7jX1F`py1
zz6y@`svv4sT)J>)S=C8SbuA92tatoLl^0lA!@rcSkJ-fZKDv8aqW_~Qwl9t{8+Lt>
zWSW2f|0^-x$(Nhd`qgeNc|9jgXTy)ncRnrL-F|6rM$r706Tz1h&jnZfKfY{%=us}=
z*Sw$KomtU)$zEdR9`%Z#<_`teZ*$yO9<Hm)zgsDbBXPnW*2#-FH+|HS*|Bf+m0s_j
zxcGhdr+xo&i7j?*^ISO@{}mJVTzdU9Ez<Imjkd~ugHG)rFQy;&g7bFFJHh&+MJQ!{
zrLW`0ig~{ZuC|C5)EyECEu0&9&Y$H~({28QPd1Mg=UOP-H9t4u&_eMue{Y!2UG99e
zQF}*0fL`T%+YY^H>6_)}ycX0ougpm7Nq)a@QiRa!1<M?=+^*EvONz=H2p9a_GWj{L
z#V7sdh))k^{QunbaPM=*+DMMSZb{Qw=G<1f8Kp1!Aohc7s`29D_@H-EE~R3>-6tHA
zekJ+P>}G}?-|9QDe>dJYoL|EIZ`a1&inpQqx8<gL6#kf@J6T`(?3)=c6lGhU=|4KO
zfiwO=tj_t%jp?l7iz6+?)-mpw+T)fO5%g%y>OVJ6Zu_w>>eljgH-6m=$Wq=S-0y1F
zlo4?BW<!60?}N>bJKoH=u+;Rxf%|6W3_`EZs~CKUd683nnnQi|9j!&b=7u^uD_yV%
zQ`ht9I+TB8x6w3tgPZRS1ypoBmir%%c^ncp?_xvUb=57;CfRSiU)-?Go@>S;=kyI{
z%Uh<NYB846=g5qnsdHcQfYem~M3(FZtKJn7)qcw&{d{k*ru2FwKIU>z)i6&3r)<^;
zJyQcqV0wOO(8Tx@i2W8YGchtTv4nh^bl8BGjZ>@5qwPB{Fj2EI7?>M!8*s8QhqAB<
zGld2l3ILNmki#X+?g+^qhGGUHAQ5I^UZ{wI3n<4J$cghBni?1zm>8HEm>C*IiSwG6
z8W<VDxa1q$I3L-Kz?{e2*vnwh*vZt`$Z%0dWnsDKw+CTn%F~RMm+^j=e>_ip&D(f6
zp^shL7o04z`L}PLxgAfl&6yV_DsOM>>fBZ7ll*3HQ2#~iE`Eu#yVEq%9ywkRm^<fj
z;rG3p{>>2mt0}R+)1O&VuAt}nED6r@LXCR`ne2l%?GmY<{5Ub}blyz+wXWw+{QWv%
z>GCblt}`(+GB6@L4;X~ZKzG%N@=sitqQ1pueVS1NWAJ?ji~K(MaO>?;_P9P#Pm8tx
zbo+kO;(J+XlQJD=Sl-QOHeY_>^{yiwuAj7OnjQ&Fn7^|9VAKwy_`P2%zXqMO>O5XK
zKd1Lh+MT`C%9;u0^RBI0w`_f){rdVDL5@qK>u;L+9sE!*VY8$$|I+uee?K4nm0$HK
X;-x#&hrK5oCU3Xn@|v?MhbtNY`7<5~

literal 0
HcmV?d00001

diff --git a/xwords4/android/scripts/key-setup.sh b/xwords4/android/scripts/key-setup.sh
new file mode 100755
index 000000000..25d323b01
--- /dev/null
+++ b/xwords4/android/scripts/key-setup.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e -u
+
+HOMELOC=~/.android/debug.keystore
+HERELOC=$(pwd)/$(dirname $0)/debug.keystore
+# SCRIPTS=
+
+if [ -L $HOMELOC ]; then 
+	if cmp $(readlink $HOMELOC) $HERELOC; then
+		exit 0
+	fi
+elif [ -e $HOMELOC ]; then
+	cat << EOF
+* You are using a different keystore from what's part of this project.
+* You won't be able to install this over something built from a
+* different machine.  If that's not ok, remove it (i.e. run this on a
+* commandline: 
+rm $HOMELOC
+* and rerun ant to use the built-in keystore.
+EOF
+else
+	echo "$0: creating link at $HOMELOC"
+	ln -sf  $HERELOC $HOMELOC
+fi