From 026db5d6e3da9626562dbaab934512e4321ffe93 Mon Sep 17 00:00:00 2001 From: poikilos <7557867+poikilos@users.noreply.github.com> Date: Tue, 16 Apr 2019 19:39:18 -0400 Subject: [PATCH] improve default blood and prepatch.sh --- .../codermobs/mobs/textures/mobs_blood.png | Bin 267 -> 1367 bytes patches/prepatch.sh | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/patches/Bucket_Game-patched/mods/codermobs/mobs/textures/mobs_blood.png b/patches/Bucket_Game-patched/mods/codermobs/mobs/textures/mobs_blood.png index 77cfbdaa665922472018ffd016e7a47c974e6bf5..de83eaa52a12006d4bde989aa08caeefbe95b031 100644 GIT binary patch delta 1326 zcmV+}1=0G80@n(VBYy-XdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U-|cmg^`C z{AU%j1SIhg%i(#>>|mBZ1;*}llI}@Q=kuBqz(SS^m4qGB|M`2Ezi=^0FwRE}DFlnl zC6_p3qV~A*>dCs*?;CqgKFQ6szz_*WIc_yzIoJ0;jP;}@W+ZaQ_T-mya zxU~sX;_`nvy1zH4DgzUDA+hLnA{4-vBpIVa4`!fam&A#p_Yw}IV2h27n5Q$Y-(TM$ zHz)K>`6o)R8Gn5tzhT;}fSwC-$56P&r*iTia&t@R;_b$B2$$zi@?I_%7jx#MZ;Ym6 z^ka9~1#CI&O`Tg=Gw78Wt@Ttui}-n~GuX2wG(|~N(Akh=1+7vdl#w0es8OateT|hW zAUf_GF)~*css=&@8Hwwn+s#IUBWP|QnWZ8f1X8}R(0_89mb*#{$Bon=dkDq|kNm2c zSCqz>1w~}_iWPA2%xs{T%n=z&Py-`0c2NBa@Y(LK$*X`tzrw88V76si0R6?&M{>y` zTA=7L9(6>qZ374q5O{zg0RuLWcnV}Avx!6qq=KLf=q!#4Xd&;p0VF#?iA6>gz&Dz-g)nXk6wN9IY^il7D5d3M9op6i#~=J zqsA1oQBkK}gGNb=B8U zW7V2!Zrr4yj$3H4X-h44>PV&Ty6>UKu08cUkbi1Jh8uo_5r>XsM!s0vv_7;Sutu9T zUQA8Jc(Dd)jHd~j$BCbufiZRj!sBFs#4u0Jtdes)nVX#1#Hb3-0O=<=jV5DY&~;)z z=;H2!Id3Gqhc^Qv_#ModN!<&~J@WR9wU*b5P8LJ63};ZSp!!A{T{CN*Z^~~+^Irj)z0=Uhd`(k(;L^MY&)0@-{68!`!K2x{2hV9}-~(t1OU*Jo>Vv{k8QzVG@;eaV zMcJF{=~(MkIxFht4EA%RKOW5jRKjU%XgZgB&j&1Vqd7NXK2SH7!QHMKe0}WE2+oCL zDm}zc8?1wGH~2j+^ZEwv0(l3?*n5oU__&=$1N*ow$drt8yqxrZ73)_=DM#E) zsSSa{m)`*upSHHPc6d!XvOYX%k38*3y00T_z-B{?@t4RRwuUI^l}Rz&RO^?4Uw@#? zN8Ek~%DfQAGmK4k6+0cZ=tr8;Mzr000?uMObu0Z*6U5Zjoske~w8+K~y-)V_+EGprfOMm5>@nVl-D&RQx8} z6GEdQJ=s3=9lQ8NM;-=;#pV0##Mj-%A<3VJN(EK6c k{TGbi%J7kqVHDs50HMb%6&Ad>F#rGn07*qoM6N<$g4eogy#N3J delta 205 zcmcc4)y*_P*@A&B$=lt9;XeZq7^~NO22z{_9+AZi4BWyX%*Zfnjs#GUy~NYkmHi&8 zfCxL&vC7ZklY3Y+>We*H978NlZ=LMT*I>ZG%FY*dUQhgRuih1>xa6Eet866dK77Be zxV!$p5}QHj9?^Ze2QAhvE>x`+Kcf9{#)T6s`p?fyI=3`(mgBQ2hr*9gTe~DWM4f D_@zsz diff --git a/patches/prepatch.sh b/patches/prepatch.sh index 3e50d37..9d39591 100755 --- a/patches/prepatch.sh +++ b/patches/prepatch.sh @@ -3,8 +3,15 @@ me=`basename "$0"` customDie() { - if [ -z "$1" ]; then echo "Unknown error."; fi + echo + if [ -z "$1" ]; then + echo "Unknown error." + else + echo "ERROR:" + fi echo "$1" + echo + echo exit 1 } @@ -46,7 +53,13 @@ what=$1 file0_path="$project0_path/$what" file1_path="$project1_path/$what" file2_path="$project2_path/$what" - +whatname=`basename $file0_path` +date_string=$(date +%Y%m%d) +patchcmd="diff -u $file1_path $file2_path > $patches/$project0-$date_string-$whatname.patch" +echo +echo "After editing $file2_path, then create a patch by running:" +echo "$patchcmd" +echo echo "* getting parent of $file0_path..." dir0="$(dirname -- "$(realpath -- "$file0_path")")" # can't get realpath when directory doesn't exist yet (we make it):