From 15548b523c840ea5b6b155625ffa12444e430db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C5=8Dshin?= <git@wholezero.org>
Date: Fri, 5 Jan 2024 16:45:14 -0500
Subject: [PATCH] Cleanup apeinstall.sh (#1057)

---
 ape/apeinstall.sh           |  92 ++++++++++++++++++++++--------------
 build/bootstrap/ape.aarch64 | Bin 8816 -> 8296 bytes
 build/bootstrap/ape.elf     | Bin 9248 -> 9248 bytes
 build/bootstrap/ape.macho   | Bin 9248 -> 9248 bytes
 4 files changed, 56 insertions(+), 36 deletions(-)

diff --git a/ape/apeinstall.sh b/ape/apeinstall.sh
index bb71c98e2..be5c1ca74 100755
--- a/ape/apeinstall.sh
+++ b/ape/apeinstall.sh
@@ -10,73 +10,93 @@ if [ ! -f ape/loader.c ]; then
   cd "$COSMO" || exit
 fi
 
+if [ -x build/bootstrap/make.com ]; then
+  MAKE=build/bootstrap/make.com
+else
+  MAKE=make
+fi
+
 if [ "$(id -u)" -eq 0 ]; then
   SUDO=
 else
   SUDO=sudo
 fi
 
+if command -v install >/dev/null 2>&1; then
+  if [ x"$(uname -s)" = xLinux ]; then
+    INSTALL="install -o root -g root -m 755"
+  else
+    INSTALL="install -o root -g wheel -m 755"
+  fi
+else
+  INSTALL="cp -f"
+fi
+
 echo "Actually Portable Executable (APE) Installer" >&2
 echo "Author:  Justine Tunney <jtunney@gmail.com>"  >&2
 
 # special installation process for apple silicon
-if [ "$(uname -s)" = "Darwin" ] && [ "$(uname -m)" = "arm64" ]; then
+if [ x"$(uname -s)" = xDarwin ] && [ x"$(uname -m)" = xarm64 ]; then
   echo "cc -O -o $TMPDIR/ape.$$ ape/ape-m1.c" >&2
   cc -O -o "$TMPDIR/ape.$$" ape/ape-m1.c || exit
+  trap 'rm "$TMPDIR/ape.$$"' EXIT
   if [ ! -d /usr/local/bin ]; then
     echo "$SUDO mkdir -p /usr/local/bin" >&2
     $SUDO mkdir -p /usr/local/bin || exit
   fi
-  echo "$SUDO mv -f $TMPDIR/ape.$$ /usr/local/bin/ape" >&2
-  $SUDO mv -f "$TMPDIR/ape.$$" /usr/local/bin/ape || exit
+  echo "$SUDO $INSTALL $TMPDIR/ape.$$ /usr/local/bin/ape" >&2
+  $SUDO $INSTALL "$TMPDIR/ape.$$" /usr/local/bin/ape || exit
+  exit
+fi
+
+if [ x"$(uname -m)" = xarm64 ] || [ x"$(uname -m)" = xaarch64 ]; then
+  MODE=aarch64
+  EXT=elf
+  BEXT=aarch64
+elif [ x"$(uname -m)" = xx86_64 ]; then
+  MODE=
+  if [ x"$(uname -s)" = xDarwin ]; then
+    EXT=macho
+  else
+    EXT=elf
+  fi
+  BEXT=$EXT
+else
+  echo "unsupported architecture $(uname -m)" >&2
   exit
 fi
 
 ################################################################################
 # INSTALL APE LOADER SYSTEMWIDE
 
-if [ -f o/depend ] && make -j8 o//ape; then
+if [ -f o/$MODE/depend ] && $MAKE -j8 o/$MODE/ape; then
   echo "successfully recompiled ape loader" >&2
-elif [ -x o//ape/ape.elf ] && [ -x o//ape/ape.macho ]; then
+elif [ -x o/$MODE/ape/ape.$EXT ]; then
   echo "using ape loader you compiled earlier" >&2
 elif [ -d build/bootstrap ]; then
   # if make isn't being used then it's unlikely the user changed the sources
   # in that case the prebuilt binaries should be completely up-to-date
   echo "using prebuilt ape loader from cosmo repo" >&2
-  mkdir -p o//ape || exit
-  cp -af build/bootstrap/ape.elf o//ape/ape.elf || exit
-  cp -af build/bootstrap/ape.macho o//ape/ape.macho || exit
+  mkdir -p o/$MODE/ape || exit
+  cp -af build/bootstrap/ape.$BEXT o/$MODE/ape/ape.$EXT || exit
 else
   echo "no cosmopolitan libc repository here" >&2
-  echo "fetching ape loader from justine.lol"  >&2
-  mkdir -p o//ape || exit
+  echo "fetching ape loader from justine.lol" >&2
+  mkdir -p o/$MODE/ape || exit
   if command -v wget >/dev/null 2>&1; then
-    wget -qO o//ape/ape.elf https://justine.lol/ape.elf || exit
-    wget -qO o//ape/ape.macho https://justine.lol/ape.macho || exit
+    wget -qO o/$MODE/ape/ape.$EXT https://justine.lol/ape.$BEXT || exit
   else
-    curl -Rso o//ape/ape.elf https://justine.lol/ape.elf || exit
-    curl -Rso o//ape/ape.macho https://justine.lol/ape.macho || exit
+    curl -Rso o/$MODE/ape/ape.$EXT https://justine.lol/ape.$BEXT || exit
   fi
-  chmod +x o//ape/ape.elf || exit
-  chmod +x o//ape/ape.macho || exit
+  chmod +x o/$MODE/ape/ape.$EXT || exit
 fi
 
-if [ "$(uname -s)" = "Darwin" ]; then
-  if ! [ /usr/bin/ape -nt o//ape/ape.macho ]; then
-    echo >&2
-    echo "installing o//ape/ape.macho to /usr/bin/ape" >&2
-    echo "$SUDO cp -f o//ape/ape.macho /usr/bin/ape" >&2
-    $SUDO cp -f o//ape/ape.macho /usr/bin/ape || exit
-    echo "done" >&2
-  fi
-else
-  if ! [ /usr/bin/ape -nt o//ape/ape.elf ]; then
-    echo >&2
-    echo "installing o//ape/ape.elf to /usr/bin/ape" >&2
-    echo "$SUDO mv -f o//ape/ape.elf /usr/bin/ape" >&2
-    $SUDO cp -f o//ape/ape.elf /usr/bin/ape || exit
-    echo "done" >&2
-  fi
+if ! [ /usr/bin/ape -nt o/$MODE/ape/ape.$EXT ]; then
+  echo >&2
+  echo "installing o/$MODE/ape/ape.$EXT to /usr/bin/ape" >&2
+  echo "$SUDO $INSTALL o/$MODE/ape/ape.$EXT /usr/bin/ape" >&2
+  $SUDO $INSTALL o/$MODE/ape/ape.$EXT /usr/bin/ape || exit
+  echo "done" >&2
 fi
 
 ################################################################################
@@ -115,10 +135,10 @@ if [ x"$(uname -s)" = xLinux ]; then
   echo >&2
   echo registering APE with binfmt_misc >&2
   echo you may need to edit configs to persist across reboot >&2
-  echo '$SUDO sh -c "echo '"'"':APE:M::MZqFpD::/usr/bin/ape:'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
-  $SUDO sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register" || exit
-  echo '$SUDO sh -c "echo '"'"':APE-jart:M::jartsr::/usr/bin/ape:'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
-  $SUDO sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:' >/proc/sys/fs/binfmt_misc/register" || exit
+  echo '$SUDO sh -c "echo '"'"':APE:M::MZqFpD::/usr/bin/ape:FP'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
+  $SUDO sh -c "echo ':APE:M::MZqFpD::/usr/bin/ape:FP' >/proc/sys/fs/binfmt_misc/register" || exit
+  echo '$SUDO sh -c "echo '"'"':APE-jart:M::jartsr::/usr/bin/ape:FP'"'"' >/proc/sys/fs/binfmt_misc/register"' >&2
+  $SUDO sh -c "echo ':APE-jart:M::jartsr::/usr/bin/ape:FP' >/proc/sys/fs/binfmt_misc/register" || exit
   echo done >&2
 
   if [ x"$(cat /proc/sys/fs/binfmt_misc/status)" = xdisabled ]; then
diff --git a/build/bootstrap/ape.aarch64 b/build/bootstrap/ape.aarch64
index 5624ea1ff574d29dc9bdad31786a7298e54f7169..68809391c64a2d94fec767832cbce7c1fd8b3cbe 100755
GIT binary patch
delta 2518
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
RuW#*gWUBw*w)5Fg=syJ^!jk|1

delta 3065
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

diff --git a/build/bootstrap/ape.elf b/build/bootstrap/ape.elf
index 681dc58ff304d4a53512589fad3e529377310f96..3aea50882b20bfe27ea5270bc8981081001be7e2 100755
GIT binary patch
delta 1535
zcmZuxU2GIp6uz^&Eo*<6ZP`MN0$U}ih*~BQ!xkzXx}$gKO!R>!P171lje#a2!VIm3
zGTY3K<#uw7$ztS<l9<@|AcaO<1efVnmR(+y#smWi6hi2(OLQrSEePYei$5>!!_2wg
zJ?Hz*J@=a(#iRJ+H!I45sProf9_xF9tNmyB2t=qXIB}8N$9WD{#5=uR+@|=1x1GBk
zcfAeV`H2Q!_hXzE-(UR{_gwr)b*HaGCUfzD#SL{A@E=#C$FGa#^^k1W;@*@@yHoKm
z7dILBtdwEoGPxuPS=sht%hAHvoG;faWV_9eiIgckjax1+LP#%@tm|3;HvM`)8fo{7
z=2fmxE}m*-1m;wra2lI~8KnD5tbr2fhZ-GnILMJ=S?x)gZVsq+UjUdBvSE7^+WJr>
zn*;eXkYV2Q7>!y-(gSgX%nDh-!L;td5`=Q=e|OyoxpA5i<%i%Q+aCllU3ZynzHrBN
zEk|eM^*~-P9^*><CHe<IUtie4M8)VJdR}jb7q|T+Fd0Z+0Sgb(m&tUH1G=~10)$Js
z%eNUJe{hQK;r?qxXIkT+g?sNqFS%g|L6S`=A(ymV(DLJ<n`^5O68Yq$vZg1Y(5<U@
zm0Xa`*`i2>eLmQtFxuW9v0<i`Ve?uMul`A)+A3Z)Zxj`xJC?J*2HS%U<gAf0>Buq{
z6$;qa6AV<yMYY$-eE|ajr9cQFOe3p!Y|a#Al1?B7l<LHEWT}fR$0%Z3f<dnP2>Rbb
zgN|Z%1yt*j_KYDoBUR<GtiD)`ZuGY3wJPoQa)lbPxyq}TVb>|lU^C?}{GgJfe&}0p
z#OS^<gtXG$ZJ7+$0}7tet1zuz2lV+JFjlx|-YUW!3Db~Yhno1<HCSOcg~KWRrbIqR
zPzD_seC#URH3+HXaDY*@u$}%1F+CiD0D&pnsjm_SJk~bitBg6kwG|3v`%@+?(@2fy
zQ3*fX1GpqOss-BHSq?2x$o4m^bA_mfw$P36?ip3Nc_19m_1!UCSM`?8kZ1t46Ls(q
z)6tSNjCwo?he47(%$gF-c~0V!4liYd>D<ma*H!GEQN>mdfl;g($W-ii#)YhC{>e#X
zMj^lPpG*qV!d<G!p4`ijZ#nM=VNC055h5vt{2C#~Y;HL?O~`(WLLkJd?vk_MfHBtJ
zz%8)6-7yY2V^CKPb(TX?182<nP5qUCEYz?O7rv71r5KEcPxNiut?k*}(uk94*L$z*
zia^9%6h6lvoW$Wdg;uR><qxJ?{kQZmJ|VttNRiF2LQ?pg_N=&70hdI`d4>Gq>KW)n
zA#UzCYj3*L>?|gexp(0l_~fqLJ9cVshZ^xAg)1`mD;s(ed%lyyPw>`J7?}+I7VeT;
zm=1VxcrdYd8=nj)w39RMHENyay>5NO2<FVZu{OG}sDCY=JU@crpP<uY=1a&5KADxt
zeHsMZ`!`kr7^L_B6b}Sn!fqN5J!E6ksul8cAuf|Cb79lo7ytJh?ApNsV-eCZp1bnz
z-5G$ufIGWncPiiPy6(niKK9uI_^O8%TrU{W-*zCzGdsxcWWFCZ;7b~du5ae8T3EbB
zyDPbT4@7OzQ~XLuYf?#ukA29H^rONim5N+m14N<Am-Fz2EMYPE9=s||e7$6K)$vfs
F_ZR3dXnOzv

delta 1489
zcmYjRZ)_7~7{6=FR$=4X{iE<<c0`?o;5bERaf2S|;d62|EV4ibGnyHq#6M%Z<4*!>
zm+Ki`E@wzO5)y-%i6kU`sVv3<I<8|W9WjdifSDwMN!25#aYHHF1kUFz677fU`#$gU
zJip&Pzu$YKFbc<BTU@GVD!)?wXM0{{>mF_&1R17OKlTHAi1n;klHTF%VVl!q-Ysk~
z?Rs0-%vg(W*CXsJ>7m+{?2`1ywL21EY!87cKkb3xdB(>u`*%xZzDpuApqCXcd8qx-
zHpQQhwTIgz*OH9A{<zr{-ePum;%veG;EwCYy+SD4g5WawUdTtojA*cD8*x9*;zQ8p
zSdkmIII+MN?UT1%w@0_Q5$hsvUF=4b^u5}a#!GPLy12X~Xr-`Z1fXw1GIv?&XO^}l
zBr+}Xu4J&FTgsE5%~h#YapR!hX%h948Wi~wbpBY4Fx<$bkSkS5S}x#RiR-RfC0t+v
z3`5hZgfA%-ZNZahRd$Yha2+GR@>9G8X5%Cd({}%I-5B}h0!_R5K0YMlKmg2V6Q}6u
z?LS>tx73xA84bma{*Z8v<^d72lEHvxdnFPL$$ggd4xR>t<c2ls79lyrzImSJsm-|d
zFzPbN9AdHO6AcW*U$aLmO}UYa<{<kYn|6vffNY@eZzPnkC0rw}U*wAq0o?-P`4LYt
zyZo@aI}5|Vt*v1gbCX{--+qjPzJjFvJOf&8nMjWNP*c!;nt@ecqs(|p*CcM~)=&@(
z)xzx9s=0h@smnMH2C`rrw(Pwq6t+zS!dPv_XxR-c6AM{}Mhvw8eOD@VO)jHbiQmBx
zahjc7$p0m?#sWhKP{~&D#puy>%c7~WTAS<$bgFgOEx<a#==ya5brHA|&UGZ}cfJwH
zDQZ6~QmesS6s%*II7xi&$CyO)0RHioknE^JI$K#~5s)j+3?76Y)F{uv@IuADYlOTW
z#vmh^U(o<x#Hyw?WietwWI~;Fmh)wM@~-QqEcGccYd=9Gz9^Hjvs2WITxteI<I6w}
zXY7v>n1=Jnq%1BqP2*F7c9)Ht$0>qHZg9tQ=z6}$mrYsn$fP@CAH3zdveBK<t%D8N
z{XOhXCS-CIHMX~*<}%KXpE^g!hz-akEIN(gM9kQq&Y}yA-VBzX#?nX~lfc=Mi32&@
z@fDid+{S%l71>tzX5nnSXYc0zSZAwj)-;3BTY&LBuMa4L1D&m4)I;PlH<E+MttdB=
zkNRiT4RBW2D#kXwh{uu3N}I4vM%7|uS|&wdI~7$Xe;^;rzK%pG%FBEac>~GWAL47l
z`Tl{o-c@#oTj2zF#R4^?{DPVt{6dN}bNZRe&^P<}GMNSQfEOZ%v-{rQ#sjk1&uR;J
z_0r$gg%bT9?dIC#eD(fjZhT52_sxdyj)M2!*kX)fx(|cssKSwkwczGq_&yz%QY(`g
z=a@wD+Wf|S>mIO2>i7cxV;>)lkzSlAN>N=IHwFw0pd>qbBsZV9+3w<%GR%slibs7x
z+4Kcdma?K_z0!m(a=rKw^b1E)jZ|dn&}%@h;*~ie6LAz!u8KDX7pQ|cefl2NR2&tO
s&#&k7lehyapAkPnje}P%$U0a#De{)cPl^24wfe_v(*2&6GvToBAAj{}?*IS*

diff --git a/build/bootstrap/ape.macho b/build/bootstrap/ape.macho
index d289768384dd2f06995a2241f4a75a23d908ee18..34c3e294afd1b4e565d8320109ed40396b5b5733 100755
GIT binary patch
delta 1543
zcmZuxU2GIp6rS1LmbE|3wzN>Az*b2rqLfL*u!Ty8?&!UACi*~=rfDBYjR6u7+ZkF7
zWwx0e%kAVElf_7Up(Z9aK1iWa7r|w^m1UO~r7^)k0)-H|>k{1-#1@3{+{I{2*oT=j
z-#zF1&OP_LJBmipM~A9QYPkRXN@|XOx}JXwJaLIXz<Z9C#X7v5{MOinw~fCYbG`Na
zg^7A!*Au)JJ6QP)|3d7u$_`&UCiAg@rS-KJ(Vti4CvQmRjUcwGQBM-nu4L@1rHuwU
zC#RV(CYNO~gKaOe94&;*g;Ko?+pT^?<aGX7)O=+L$LS@qbwdllqF)clBW-@kyvFBC
zrPD2pz?=%?&meO!&FTIkYoG}Fp+<)s9&+SpMtd65Z2{HZ69DEoHf)bVTOO)pTOfB9
zGR%7(qd{v=cpwgwSurCzh}J$>#&OwAf4FX#+&sgGazpUI_WJ=uH(p_j>+iU(<>-vO
z4#?}I<9w07NdExn>+-vqs1zCGUew#*#qT-=Oa`Z~f)5X;ufTMW2f8=mAjHerE4LY;
zaCnOL@&7fVGp%vZLOu7Pm+UZvAjzf_$3-m{wESr3)`kj>lZ3>ivaUO>&>d?8m0ZN;
zY(XN!J|8Sm7;Vo_$S{*Dka@j;*8Z$eZH<7<n+1jFj^!MzLiV5oIqT$fD!jtw@_A(I
zaRw^nlG@{Bzl4E+QXt52h=$h)$ebx)l8SQ-DAq}-@N$>49HW4283wuWL+F1yt#K5)
zGoV_RwdV}c8L23ZX7r^}WQ(_1uU2W7m(N#8O%-0f1i4Or2AN5J{zsJ@^F!aFBSj9B
zaGX|LyN$_k9iZSDy#mq7jX<B<4P%9a7OVoCkvI+cwOpeRy$)Z<O`=dzza^6|I4FY-
z3?X_A&KiVNax}oGn%PSKgp?W%LcoD3+o-P`20Yd};wz6jg0%w*u>A=W#xz{zc~l|{
zcLOeqj%tDSE|x=!6xjZjb*>Qg$acB~-rb`rzW{{e**$j**Hyj6J;dul?PM)Hq*SCR
z4Wk}Uz-Bnv9%fBR<^nGZ2}h9A;&gWJyz44<_o!m4N5Cl73}h<y+v8$JGXLUbGNX{+
zg^wr2Y4I*quqXQp<Xg^rH87@4)f`8X3i&NejM?l;aGIF;jthbitGY|hfdj@^e*<%1
zdAofabjF~r6zVL8BnQr#3tRik0a>hKBhG(~?d1rJhEDF;*{k*SHaDPz+WGFQ`@#@0
z7lqCXhbK{JUZEAMTZF@@7XO?cLMNp+3^}~*HAo7b*PfSlDBzMXxuB3=T|Et*D8$X4
zVC_v8o1H~uGW!nf1D)E}yL+$pR<HpbQTPILzp}YI-uFEYJtbJjU}PBlE#4(_hz@vB
zXfVEir;rFJw1YSAHE12?y)J$82;$A0u_3a!q<@2uxG;j?pP<8I=8DKFA(6r4KCJ=V
z`wvzI7^L_Bln&LrjNB9&ddSA6RVw6{d<>H*b8+kbmma$hcI;q*u`p>L&tCoa><mC)
zz#W~~oys-2uDhj4h<^S6ZuQWj>jfkFTMtDAW(Vv}=K5g)Zqis}Q<Gp-!^i8itDMhu
zL)02MEv$yLMwO(6=m!i*Jt}Nesl?|rKoq)ir2sc%8H>pe;8l6zn`LV&P6UI#zX2ch
BXsZAK

delta 1497
zcmZuxZ)_7~7{6=FR$=4X{iE<<c0`>Ef$bEX#SMC-htIjIVUdMpun%U2sPWI(di+UX
z?Q%WC%jFD7M?y51nMgw7m&#%+pyN80(h;NB512_Jm{dJ-8aI@(P2haqqEQq3;rhPM
z`#jI@chB$l-Z+fIu_HCbTIN5$V(rK8Zeaf>Jn=1ih;^-5k?M8#v5lz-cNbeoIqoJl
zJ<;UZ{Sf<NYNUECyCU^Lb#EN>odGc9CtNVP$aolL{~n1fc1vUqv{H;q9BO~KHRjDl
z+Jmi<V@mp7Z`9}xb{QS6D4Vz5x#Kudw-CrQAu*YJBjmzCM%3A}^|+s8@gb-StjJB8
zoS5ee*2&wB)2Er-n0b*mFZLix>RxqI{Ux|_U0huh)M8N5eK0U38N1EYlPg=}5}6fw
zN77l)%-G|gE>tKLQT?FTZV<Ji;urZMbbeQfFx=R*kS$h7YSw38iE55gAzWa53`5f@
zgwH4yb;%WPj_sOs;W|Qo;%9ghjQVLDs^$FdI1%#W1)6sAZG1@j0UsDo#ZS@G+rK%E
zW-4nXBOHk8g8|_j%>yE4B%J}(a!Vu}kOxfr4LtP;iOuVkE+H|(zH*-CDUG;xG0G~*
z7-6yJV|5I}U$e%`O}Vj)#xVO2n|6vfglu5o4<r<~BwQn|SL6$S13G!c^CF&PbbDc4
zPX<PRZmVJ#W2;v-UVnsxfxM*tFb8UOl}L_zP*YI9pM#b!P-Z-(YZ5gzbHoq2Vq$ir
zWg!<?=`gm9feh$}O=~X-g>B=$AXXa@T6P1=#C(RK5nai{z?E`cgTrWM{1?zgoMvY?
z@_*i_GC>!7RI(Pn5I(wbRXABvsuLZ)PNfFB`B>W@-n7xDECXlCzK%q__Lm|#MeT=0
zN+lS}{51>{CGk(Z7?X(R!#~~>5*-ytXFD5P2IPu8hX;WNHL<5*bg69L^+HYyVvv!H
z&uM@!U{ynFY&l{<XiAy4SMw!n`mW<7O=SZZ)gK}fUyw=3-X&@UE;)yy@g*RK)7JZO
zOv8DklO~s(rSTa-y~{?8;}k(8H@M?jbUk0-ONK1DWYUwi4&HJcS?@_}=D|Ab{uXv8
zQ!=@V8e2P1a~WsH&zz%U#0KON7M(_LBBrg6=Fx?Ee;UhAV`->{iQ{a^)PXGS_%cm(
zVavXWvTW=6GjKNAw|CoMq_bHzsv1G>&%@+vFAc?phdP@<uZ7TMZY&F-TVZZ27xvC8
zo8hdmU5spf4v#~ZW39pt8C8prS(y}som5nr{EB=`>pBvpC@=5@<P9Wiy@#&_=Ld&g
zeKWQv*bFDYE#|2q<!6=5@TXF!k<-qUhrZ3rm&iOA2iy=koZ0s>H|dj&K~`PDtC#w!
zCJ-NVsW;mai<SEuxyc!c+&AjJJ__!?V#_gx=^hNCqw+`U+Q7-d=zTh_ShY;%>|+wi
zsf%0oZG6BUspAX$i+yxFLi%x{C`Dy?+!)X?fRgm~Nlq?)v)#cfr5j~S6^?rRvf=S3
z&DffbO|b@ak>kdXpjSAOtfwMVhh7766|c+*nTX?na+SR?yhI(uX|wmJrsBAecxDr)
pox~kb`Sj=sY8<?Be%8jyX^}TYen#XcuGKzTm1<*~&IE&=KLNBhY2E+;