From 04e8529e4149fb551266a9544b1bcba4d9782d9f Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 2 Jan 2012 00:52:00 -0500 Subject: [PATCH] Minor cleanup, mostly... --- .gitignore | 1 + bin/processing-commander | 10 +++- bin/prochome-check | 6 +-- lib/preferences.txt.stub | 67 +++++++++++++++++++++++++ lib/x86_64/mbh-processing-practice.jar | Bin 5065 -> 5078 bytes 5 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 lib/preferences.txt.stub diff --git a/.gitignore b/.gitignore index 6b468b6..ec6e61a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.class +lib/preferences.txt diff --git a/bin/processing-commander b/bin/processing-commander index 373a5e5..78b1e46 100755 --- a/bin/processing-commander +++ b/bin/processing-commander @@ -1,8 +1,16 @@ #!/bin/bash +set -e + TOP="$(dirname $(dirname $(readlink -f -- "$0")))" +$TOP/bin/prochome-check >/dev/null + +if [ ! -f "$TOP/lib/preferences.txt" ]; then + cp "$TOP/lib/preferences.txt.stub" "$TOP/lib/preferences.txt" +fi + CP="$CLASSPATH" -CP="$TOP/lib/$(uname -a)/mbh-processing-practice.jar:$CP" +CP="$TOP/lib/$(uname -m)/mbh-processing-practice.jar:$CP" for procjar in "lib/core" "lib/pde" "java/lib/tools" "java/lib/rt" do CP="$PROCESSING_HOME/$procjar.jar:$CP" diff --git a/bin/prochome-check b/bin/prochome-check index 3932b0c..bb39dc2 100755 --- a/bin/prochome-check +++ b/bin/prochome-check @@ -2,9 +2,9 @@ if [ -z "$PROCESSING_HOME" ]; then cat >&2 <@3IG5I000CAkqjvU0|t>d-U5IGlNSMB5(EY!K$jHon>r8x z03sg%05JfQ0TUjRo)Z<5y8#e?P>3KT0utibRtzB+a2~{Q9OB^E#?FHT3S7(Au@YGl zdXR*5EA3!obabU_Hxdd2+TjftEdiX2tQ1OtL07us_+Qk2=m0zmi{}i8J`SDBuGx2>jJZs|DCZ1E^ z^NQ~aCVu0`ivi5ROKSM7iQlR3%W8PV#P3bKYT`8$ubX(I8gJq)MfG-o&|$UZ9W}gb z;yn}Zn>fNl1!@pejA~SWN`+s10h}(Crd0XGAHbPns-e0Xb0k19Bxs6dN)08ITEEnh zz0~{Vr~p<;0}qrL0XbSi0j!jniqSCvnI&O`9;=4qOqs2?9B;}Th0hI0L>f#vp_=?o zH02~kJ$_GNZ!!cJ~$9n59o$!$voHJzzsHfJYuo9sm1q3-F7lg^}Kn!+5) z#}mUEtjgq*8c-XuPBN#F>g*0D7aMiqR6du^yYqFDs>qw^)jyrSops%xQ zaIk{$2SMekjom$~6(WL)fsMTiG{~1b2fKPVD71n)cb(tgH?ZO2j{g3hEZ zogEvx`!sbWRd<4C+)cZ= zRPj{nns~w?g+D#)D3B(xwH@tDW*$EYC&`ZypXYiv>5$DluZm+7x>YlCmslFo8%u_l!mRyryD`|TVZ7;r<>Me029<<8U;E!v$N zc6O0Z5nsiyR8H1Tv|J`d?lprsJGNuJoz~7{we#bDTECpdn#5wjI-tbK*|~hSH@h8WPz7z{b*^`v!A`w0Ic40OlNpOA?VO6qMn!m3HkV3ITM4*kSZgQ9(~N7t8P*hx zjlf_kpNSO$J2X8C7AXn*vec4gc*K(BYFL3s{BpJ>D{+sY`A-Nb3!lN&Y9M`wC9ANL z4z{FIR@30os4B3Qbjcd}FdEe*lcgvcWzx`pmeFXTU@{OiTsVk^k4D|17`1hsWRaXQ zQ>c@S2htTHak(Yu$XZLfWt}DGN)L}V9PZdH**Nj?v4znk_&Q?9m&+rh@ITcL{Dyu*hAbw z@nn%;b4N1b?vJFIosqG8Hm8Korkz-PB<>7Hc8)s9NM5-q;x%kbq~HVv&<9$tk{1^F zWrKxp;9(07;vq{m$|g%T<8e#Q$K!&3lRCArlBrxI#;DCXk=&?Llw(AvJY@^_rXsFM zT-i!8ac#*45_lJxH&Yae*-6Eos>FvW5WSqBxwp{VEO~2L?FK!>TI+O*Sro~ov@GhT zi6~=7RPryfa25WF2~f7`Dt}zS7+tk-a6=b^^~8@Z?uz6>OFkwSS#q&lqN2!uCWm5# zTAsk9)I+jPFz1g~d<*wsf`M43;9C+?i8+ji{o+_MqM~V=thQuS;(pm~$qr?egqj&s z$tLYe9%h6@EJ;Z}OBl0bGF>^F#;6K}KH(w)D{{}}HhU&73 z=*66~D@RwJRSNuNs>rS=?A6YH-mRGz{Okrsq%q@MnvZ9k;e~=_rD*>!+9^RbNvq;T zup(0KZ!&cB;p7{!vmX>>5zlY;rbLNB|KyZiq+x8OBD!Ach{{s&a|#(W^>i;WV_IDs z+&`U>?hHztmg*Fou1CKoSqp4hG*7j+$j_CdkhXs^bz~%;NJO$sVkb#|PA5;RwJxVF zJw@7xJIjsDCm4Uhn1AGIbMYdqiSUZI&E=O9oM!*9a7{L zi?C}OErw!W+DV?%Q((S-TcuH1PJP^)*%{9kW!fD%MR86z_GPS$Ih7uz2q@hm%T!#g zC>hv}couccDf3d1MUjDGI#ExaBsjOM6op_RN!DYIkyJjZZp_GT_85gdL#fn`$s3@4 z^49Ge+U~?y8jqh=2Hkqv6X&(7TWi1TnB`N5-7C9T9jA6^oSnvha+RH>Cbd~-YC~qJ z7eRj^(8yk)1^vgEJ8U(MoyMqt(rmoC)qXY-o;|Tt#%b;EC=`7&UE*EEesi1ZmDz-K z6Xhv(B0H_AbuF?~cWJui%WjS_ z8nmg;*`@67qvo5GNp~@1Xws^&9mDYqfnYAxliKNII<@yrs#dUPOXKv%R@ZPmm&$yI zFsmBNKkn9X&_-A~o!!(B)=a7rc0Q>d!@kC?3a`mJX**+o^VH5!n^DfL7_%EY|CpKU zJg#(&S(kR-34BOx$k^(URN-VYo}R(;j!^G8g(a9D);5(1!%iU}`~{RPiHf4KZHZc^ z4B-!5q`k>T`P7vySYYa=T1^4#EIhMjmkZZPRRi3gNgsh;R4cb;NggaEo}tgVzur^We3_lOFtd;wcY4pLp7X*Au_g zgC9janOs-D2n z?KR<=g9x=%g{q8wn0p8_w;aGRVV*myA*_aDIZWWVgP1*z8%TG&=FsUvio^Otn6stj z0Oq#WC@5Ux;So_BPH;IKz=`d(VJdJ^?>NqXBmF$hslkP`ES2Lplj!`?!u-O5Z@eU0 z!^vc)EI6xSK}obLgEId9jbYzom>V+pAQUovH={0OR^E*2kXf}4WB|1GdftJ0fSKsJf?q9_H;YvnL%VP*Ov?~226!t~6L4ysa=m~|MsuWy* zyq9yQX(PSdB==!SMO&ch5KiAB(F15B9y0eTw+6;>JB8apD30aQ zA)L8IpB^6X+O6t&(#BooeB37)IE5 z#&`}Z_4ie*VlpwcWIMJpW!m7w8BDD+Vd5-iX*+AuQp~_Irr2_XaW)oXC818N!y0VB zIi%{wFtP3EVSQQ8n$gER?(_?%k2I#HsN-hk9)C&Z}+Wu3>V4zG$3* z8;#|-+33bTV?Ay$25_sf5nnQYF2R?L5!`0PF>WMqyOGBo#^t!vxB_<>H{dJAP57#D z3+^_?vER58_Za(e!1w{~H=e@RjA!r&E&O%k1w3fHO!!rN!+0GJ8;9{t<9%wcO4V~L zQx9Sx{*LvyhT1pcv$&3sDr}!4RExzjfWPOeh1rs%Ew5#{J3-?30xN2N0Q2}N{s%%q zN?L_~#PzT!|6J@LMUWC!(DDj;fvY#*i-cY${f)SZP#DkPX6z#u7DU{FTh)*7gjCsN zqhP#^FOk-OX}n3_jgnW;cn$wV$cI|v72HOs5;Ke!F-{4pFw=M*|4hh_u<osZ-;;c}CIQ)pOqpIz1b5LWKN z$D1F-%Joh6VhK}y%>>Swz}jAd-EBUO>)I+qm8^%XE4;N<7m7ku71ncAIbhZ4aiPi* zRA#PWJqNPubxQ|z7>A##^eI(zB|wvk3w)QVe2=mBBOHgP*z^1t3-A-1f}gPi_yuqJ zr+(Ij|r>S^>_3OHOp0eG4K*?x4YOtwcLkZfbpoUF) z++3PHU*lW!xK)oAl-4fP_{a2kksdGB<0X2u^*B`89n<*ml#m-@cLn?gbMPWg#7nFo zzeNjv#|r&2>-Q`4%kNp;U!|d5LoZ%uwSI%O_f1@cw^*^?X2m|tZt@*=fbX)idyn1P z`)rq31*rd6=V<)v#qbzwkNW9VH&x%nBLx>UYn=Zlg{o2$Qt2U-g2M%mel($3mhiEU zCJdG({0}@{AZ*dON1BQ|r%~2=D2)>36B_&09{^BG0Rj{Q3IG5I000CAllBog0s{t< mF%qx>fCQ7{5`7H>1|mS06!4om5C8xolWh}L2K5mD0000Dzfivb delta 4279 zcmV;o5J>OVC&?!aP)h>@3IG5I0071TkqjvU#Q~8w-U7t|lNSMB62$=`K#23uwJi_; z01+Pm05JfQ4ig@es}mKIy8#e?q9lfdC=iH~STPN$3C@E!#vu-VVdp^z1+JxQTSS(G z9wceI^)b3JTDsD$9Z8|2w8I-vS^_v3St*nPgRZoLt?#bTLZRbX3KYU4`=4_q`Pva> z%@2;g|2gOT&i6j&`jL0;$L@Zb26 zi65)qpP2ZmiJzJHxrtwx_@#;eG4U(4@`M_mR3d)u$8Q1%;W0HlW#VZQzg6TjO762J ze&@&k1~3oLso{AOFR0%a)$o#umreZM#49HLVB*zkyoT2m*B=9<-cVcKRKpPyZw2r+ z-ZAm6iK9GOpawC;@JmI104u~-4WCq+Qsoza04v2*Lv=OgNr1XY&=kv*8mcR`eyQUb zQty}J0$48%JXK}{WTu1ySSPcTwAlffBaI3kuZ9y$nX9DCGv!2u=LaM#4W=xpro59( zIazTpH02aiPBmqbDNUvX$PF z{!u59ZqJMe8oDpFFSlC~c5MChdGpw zCt{kc%H)%pP#dyNGN(axcBhkzj=FRzpG)W6`8sEJI+e+_r_%|?otZf~6OY=tc*>O) zOegHza4IvVk$)(Ep39OlWu>5&2Ms$JCmD6JdeyhFv%6m)T@^?9kDBxkboLMQb#x96 zRxtk{s9e9LtNUyPL{KrXrB{&#<#Oj>XYXbOD`<1)`TczZn=fwf@9*x^lRkRKGuhSA zzPYPUb63)I*GR$aZsi##o2Bbo>~y+iP%qGnzA-zV6wGRW+HtIp7jNZyM=D0=)^*2| zPH%o}$jNNBhZ2s8Nh)e5w%VDv!i7nnof*jrW|R>|ZC1yV@!VRE>$pS{T_yL>Z!T9n z)v_U;aLD0L#~ek{CARjXoyjcZPr^y^$A~XU^9d*(w>SPvf3zd}Y>hrGov-zmv=B^8ul>Pm7jsXm~De8hcPky;GHARnhC1cKR z$|>UYOiLAH9Yo6&Qj}gZn6slhd+f9h9$TItSNr9EOg1Jq1NH%>PR`Edv%RTYJgQ7@ zDxV|%F`8kIa7WN(=*(nNJYbG@|D>-Ji#g1&CUq2i38of<5ltoXV@$}dl0 z(nbyG2RfIA#*^*I*m?Ol16j@B=C-9WF&bT;rh>VS)YzDvjCJcXiV87!{c4dmIQE!U zsDi$K@dnqs&Sa-unVfQN&dH3$lXgz!WRqe%E}KiGr>z8BH*B;MlxfB_;lwltb0aXA z%4ed5#12i*f@MkrzpS!kH6E~JjT+YC0m0HgBb6+C7FVj_0l%DO$vW&}U@d8v^>lP3 zq8h6u9db5f7m4Ur$rcoeuvqBBNTkpxnE;x9E*wOMM>CR4k@c5)93JUJ4!hq#04$uhyV_GH-I zA5OC>!(;huPAQ*FJJI-X+=+#EjXKG2UWF;_b!>CE5Claq2HLJt6qfmAz`}QMzlD2o zpCyB`*^(`I*pjVySa5QOc2+W#3rCrMtvM&08+D3$4C_*-gl(3buRPP(n+m(Gadj-| zM*UZ8CZl(ebu-1FsGU^D(4=^biZR*=x_vv{&X%`<-EPpstgTO{SViGnO6#OoE)>|?valc$@$xh{!gqj&sMJH`a zA6ABhElEi)TNtZkvTQk<#;8huPVLNUe?|GeNzqYCJnMh4Tesn<{{}~yj_R@r>&2Y2 zJ4er+St@|ls>!Y`?A5{EqlFiL;_N0!xGCdYmXBwg*kZxzQr5p0@08@411SQ{?) zZ!&fC;glP;v&Sm3jOVv`OQR&9e{#w$@-VkjVcjovMrCREIfY7^db*dHIjyb@?w>A5 zzYI!}R_RilZb!eTXbWPRwM@0QD9_cSP`-aQcX&9TNQAR2W+zEWr%vmCxvr#6Jw@KI zJIjqr%eCTZ8;kkxDp=^y-fZ$jxwPEmidALom7Gc@_AI8P4P^s9==N|1JeB1C!|&U_ z1)Yo?pDWV@^&Hbh@0r^9$=9ClRB=6EG4MAOPDbo%m$I<9qvI;1Eq8s@8Q zw3v#0X(xG3cR~0bRYqlhCG~M{W>-90)M-!nG$lFV*q5_2=2Ur{-+~r`$_JmW2n32EJIbTeJztKwU7M7@Lg!0IBT1Ur$P_F#3bU8P@O z`Z<@~7FRrFU$qygFU0&%wqRtascUh$PnvpuKJ-t0dY2W~* znM)OYJ+rB-7Jh1f;eOGa+%)wQs{DJsj{Dn(c(>$ph0hCbT=y{S^r_F;tzOhVTE11e zbT`w1F0C5d8H;B~96v3>{ge4jE)_^#aJf`>YL}Dg(9t((e!=I>P18TNI%Dx%D)Sx+ zuWu^}$F};hLX>(cIb0zafSXKeM6RN-VYo;QQ%J3@WWDU@J+SR<+uVoo7x`~}D-iORIH&l0sx z9U9+rk^ZI_6?a#+U_q!`YBdGaQTWW7TP~$1O$~5+Pw}(P+S)lV*wxp2ac_H1Clk_+uXYapF&S@F$7?%7d@q z$agKrAbs^WxRNV>OVoo3QoxKukV7yIq2e%n+m{@FMCG>IHRDwrXQ7hgQf`f)3M~|H zIvTJ7pXRLPvg0$jTK_revqjOBPm-&SB92g6mHI@IHlMUr9)Q2Ks-o3zw339Wtx-!)#c@Z6T93)*L|7AuO&qge6*EpHiKX zn!wV1s8_$u`?x>C{f(7}u&ntZ1RGkE{ZilPi)e=i8&1;>IZF5eW#ICCoI735Jy+3x z8ldDA+a+=kAG`~#A;y{!4UFSv>b1W>f7zqm;)XNYf{nokaXgm}W94>{gE&(qif;mK z<6uIOBM~zF`_a#B63{@S% zSp`lXH->1UzhWFdADuLg#_z*%w?(sC2Batn6L?bt(Se^?IVWAY$AE|209@*{jwevT{U30x&l z;nVUwu9nyM75ol9XH?@F<2Zc5n2BqR1=wqxihV{it}~Y7dSfMSFwVw)V~#%uVl@g^--9qL)krXLpL@7R88Xn7Mphigcw zUiNuXwOB3#_*gykV$Y_0$RFIlh;U94=Eb2dhAA89Wq=psr zx}u)u>X&dGsh7!rJ-$q8CZ5I(*iR|!gZK(=RDW|PrMe~G1;(rRDtQf<#w(25C}jnW zm+()de5f^^$4#UvF~fKUBl!W`EmOZ8YMV@I|?_+I+|hd*F1o;mrkH_^7;tq`A4Yq_jEvJ zx%-OlAa$p{83lL!zok7&X+L;hX%ntAIgO63Qa9kz`><{=KDzXOUaad`awl3@<{Kt( z&IC60lI&{raop5e8LDI(WKZE`b#|d4L{vXLSG59moNkw@EKz0V8hSWTT(8?UXu~-C zG^J0OqPqZ=sJy^qH05#T-j8tte!?ftPq7F;!)f>hFZ^HeVt;}a{%dXOS{h;T*`cz` z;O-$D)H$<&)qRM6x!@z`R{SfeN`2iIUGgd1jl*<>%8ye}ag@TVbbkDsAK%iM0UTu~ zG2BU|o~izvS%}3(9;Pn&26}_{0>>q^#%*xLs5J0!K$XC6`IdTy@1JKq&w~bhn~JK~ z+>84PF_~X@dF)+Mytn#w&pl81ZlL5e9yPe6VRMPvqNs*{t$N&6nmu3R?RvaGk2^|h z7i#<=Jzk{8i}iSk9&J4im3Bupj!j9qAwH&n=WrsP$4PjB9pptc<0W?Im)X02&$zt8 z&i)5F>Q(gOHFoOP*?0eli|_`!^_%S0NBDSrix0lH`H*{ukF$6AN;-0C#{7R$sVX%gl^#YZ1YGdo`!kwl86SFo#$Z{-f5*cG#%5i6 z