From c36c0759fd2c0d60a538ace121b3d6d7ec27b2e3 Mon Sep 17 00:00:00 2001
From: Robotia <spuri4096@gmail.com>
Date: Tue, 19 Jan 2016 02:36:06 -0500
Subject: [PATCH] Fixes updated issues for #13

---
 makepatch.class | Bin 1832 -> 2175 bytes
 makepatch.java  |  12 +++++++++++-
 makepatch.sh    |   7 ++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/makepatch.class b/makepatch.class
index c8f2768d9846a17b9c384dc49ceeaafa8617b12f..ddebe31587874989d873a9cadb6009a0227d1fa8 100644
GIT binary patch
literal 2175
zcmaJ>+fx%)82=qe*d?qNRuM&oO|>;dLn>Nr!5apw(GaLXDO!t%%^_J?cEj!lQG375
z^r@Y`(I+1|<73A@gqbqKbEp4GXZqf&{mu$V6q=cQd(L;h>+ie#`tQ#x08Zko7>=Q@
z8T~k;;%p4(a9+g)1p^8$#-Jb*LlXui8B%a5h8FZm^0tc0DzY(L!BrJG$r@IXS1}?*
zM^(HdpRTDW$nTgW*Hzq*-*HLam1IK7-c)ca21EKV@SY?$RoqtbzLc0$aYqH0=BHGc
z3W^E@L(>_{v4V39jfw6X43UgmB<_x!<%oQBc1n0-e99(HWR_bF!=A*g++9A;(>8ZX
z=|bRHPN`oiZYu=boEheoP+q|_<;@TqS};W=uw2JiP@;Rmt$L=oWJ#0TXZeh%@W3qh
zNRt{;=uuGCVBs#qfm>Hb2gWj&ZyTdhg!~vmSs0;wT)~V68?y{xXbl6Z29}*JnA~xM
z$DoBg%S}sH((<e%js_PMhV~azxLCF9qVP1#ft2?P)3z$UNM~%powV<nX_<XmYB99+
z^hj1}ij%}F;beMzI-ra-_y`zSOhZ+A>0C2o@~U0*+$}BLbG@18mNd-c9>c!8YdGSb
zO%4nm7{VzU?zAx-rn7+i3=J19Xn25!8a}{7c{MbAh>tXUj87!_RKsWJVc4|>#V8dk
z8279|Ci=MqucIDg!}6cuD~fTdxLI~98orRmyZ%3wG(*dTTQy32UKo88#~i+7xM*;%
z<o6iYeO?lMh77}4FS&6kn;Xgx3=bJ;Lpm~sGP&$%VQ4Zla6LD8Z6rS_9~qk0H5hh2
zFWbn}U11W~8(7bpaV_7lKi9jjUhuvj2+F?Et&)YdXZ=jA65>Nv1fT6+GgHrIP%08c
zn<k+xvH2jhuJTuVFB}fl5etDFDTdvN?w9pw40)wOC1yx%X7(kG)qbTg6;D)bZj$A}
zjhdM<_X=XJDjZYvZ&0t}ZyJdjxNAtZl)0Z@kDM07O$OC;oq&eHr!m>mp%jey0rvub
z+zQHDfF-R_&Z{CVHur<9Qxpp$(_1KHsU7_4lpk&#xr?&dO;cz~Y|f9Gw(Ap8(Xfcr
z69f>q{cOo`J&~btrmeG?>KfXJ<0!3o`D>uPL+grYnr;W_OREUc<Pz8uIxxIWv?*jZ
zq8Z20ODZJVaE7=M68JW`5_!a~{)7g-v4)5q%`Ky8Vj0Rrvaxpw>JplVkJS(x56Lpk
z*Ald&HEff2eY?J+hMjcNTZz=5lXkttE`9e45~SF+h##eXKBe!ep?wiekDvaQ()ZS|
zZxIi|L&x{Hk<$0qK!@QCMpKR9^MUA{8V+vZIQ3klbEC*(oZ4uq{%QY~PftfF)~;n3
zb+E+qDT3jZR1JqDc!vqR#~4hmL?5AxpwnNi;k8AaptoeCS3jahLl`1Yh_UKPPf!HO
zl^VMBB%KI7vLUP15LRuT$_c7j6EtkcHnb8wgdJ4wofx6p9CR$8jdtxGe2u;M4juRb
z2k;B&{f;<m#t{}rk{!lTmcTLAhZH+ci#UTcyNcs1k6t#0lWY>Fn2Xb_f`0Z5&f)}l
r?L_lGm{V|4!5e?0oeqDY*zqUY8~#9dyc4HLCPH0xn*MKw5x?~xy)q!8

delta 993
zcmZ{i$xjqf5Qo1vGtxaxv)BS70@^4d0xbgWxZsK#<Gz6FI5aYfGdPS(j0y4TP3MF$
z#@l!>F=)~xVvJ``p8W&7c=76r^~QsEun)gi_1;(Ys;k~?<+JjM_rG4h1=euWVmaL=
zYYf&Jth0!)-XhEfEgKCsS(tQd=`q=Cvc+O6+e~`()^?K}COb8{%Vf7c+GEnE*S%Wy
zne5l=0WAl$^lLV5G;zqHL0{6qVJ-0}M>uM7%;GpF3{D!Hdhlkj>a>)luy)^0`eV6N
zCOvL2kZ)CPxS19CyQ-zEnL(Ro&e)vgTz*Q`htG2%|3SG;&UiNIT}q7m9oJH6KbcJo
z=L}BUTqL1Tmdzyzh=rCVir}qG_Ud2ICdrVZHlA_Q{;g4ocN00+PY=17VRtw+>f87X
zD?+`!HkTQ(Nim{b*X9aWZAQ7KC2f<DLZ5^dc8)P<aNQ=$xT3Dp9ZTerBW^Au>2AA;
z>}5CWU%!#c`a=den;Q(~&xZGhs#_j>sd-fqd9Lz>aJ+^_nq*%33!&t{SBSPeEUB4T
zDO)AtApMQfN}B*JpgziOMAp96w~?o+#|a&rAv`ccWS}+NHO;(fO8VOaj8jFK!5o+-
z+7@7G-zjzMfHLu%a*==viT;<UbmnVfVh$pa&Ll5%g1F}_2&kH*q%iy0bE*SsCb?5I
zVvjiKIST{C=%16-3m1=T=Uog~^q-r(zewF5MDEws6<9Yn)!gs`b^kq@JuJo6&(QEs
zV;09fX~YsQz%5Yvl167~z_O`g?{&M+6BCU}gKZ|Flu<{y45xxVD&;-QXN)QtWHt8$
zyiYBUg?L9jpKz57Pt~$g)g!N&Hq}MDT92oC=ulhfRD0;AUD7vT{v>7K8Law2OpNag
ZE&4_*^p!?~4nZO^_R`fNo#KS(`VDX6!7Bg&

diff --git a/makepatch.java b/makepatch.java
index 5da6eff..bb5f5d8 100644
--- a/makepatch.java
+++ b/makepatch.java
@@ -9,6 +9,7 @@ public static void main(String[] args) throws Exception
 if(args.length == 1)
 {
 
+System.out.println("[JPATCH] Patching the patch!");
 String post = "";
 Scanner in = new Scanner(new File(args[0]));
 in.nextLine();in.nextLine();
@@ -43,10 +44,19 @@ in.close();
 PrintWriter out = new PrintWriter(new File(args[0]));
 out.print(post);
 out.close();
+System.out.println("[JPATCH] Patch is patched!");
 
+}
+else if(args.length == 2)
+{
+if(args[0].equalsIgnoreCase("chop"))
+{
+System.out.println(args[1].replace("eclipse/cauldron/src/main/java/",""));
+return;
+}
 }
 else
-System.out.println("1 patch to fix arg required");
+System.out.println("You gave : " + args.length+" args. Usage: java makepatch FILENAME / chop ECLIPSE_CAULDRON_NAME");
 
 }
 
diff --git a/makepatch.sh b/makepatch.sh
index e98215d..ba9baf8 100755
--- a/makepatch.sh
+++ b/makepatch.sh
@@ -10,7 +10,8 @@ then
 elif [ $1 == "echo" ]
 then
 	echo "${bluf}CREATING PATCH${reset}"
-	FILE=`basename $2`
+	FILE=`java makepatch chop $2`
+        echo "$FILE"
 	CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
 	CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
 	PATCH=`find patches/ | grep -i $FILE`
@@ -19,7 +20,7 @@ then
 elif [ $1 == "make" ]
 then
 	echo "${bluf}CREATING PATCH${reset}"
-	FILE=`basename $2`
+	FILE=`java makepatch chop $2`
 	CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
 	CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
 	PATCH=`find patches/ | grep -i $FILE`
@@ -28,7 +29,7 @@ then
 	echo "Diff of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} written to ${yelf}$PATCH${reset}"
 else
 	echo "${bluf}CREATING PATCH${reset}"
-	FILE=`basename $1`
+	FILE=`java makepatch chop $1`
 	CLEAN=`find eclipse/Clean/src/main/java | grep $FILE`
 	CAULD=`find eclipse/cauldron/src/main/java | grep $FILE`
 	PATCH=`find patches/ | grep -i $FILE`