From 28af8c93ec488948eb6c839b289cac7dcc0e8294 Mon Sep 17 00:00:00 2001
From: Robotia <spuri4096@gmail.com>
Date: Tue, 26 Jan 2016 23:08:49 -0500
Subject: [PATCH] More makepatch.sh fixes (mkdir corrections)

---
 makepatch.class | Bin 2102 -> 2162 bytes
 makepatch.java  |   4 ++++
 makepatch.sh    |  12 ++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/makepatch.class b/makepatch.class
index ca788c04f9ebe23fe64f20cc44e047f7315b93f0..8bbd523cf0892ead4ae52ea8219af56713e72455 100644
GIT binary patch
delta 693
zcmXAnSx-|z7>1uYUCwYAOjFP%sHGS{s7euBSQID<?pjwC6|GRAs1(X7inx2J=3E(X
zyz|n9<dA66AE1B0#Ka%rook%Ilbm<H`Q9hryeD(K(D%^Nr@tQxzz&``Y@@A+J?xdV
zJ9N+~N!oPT>~pZ$?+~QhNRQ0{hho}{9F!cA9CkRuQOPmWIxaaONg4E{<dm^aOU{_}
ztdVn)UbFUTX{X<C12*R!D$M)}E*Ke*T$BtN?vmuPBrUlj88Qb9OENZBZAPB243v%P
zi~^^7eke0Boz0C;*<{^n5i71IVKb(<#&tI(DuXu^<K)~qQ5&i!r>JK_F-cw!ao+|a
z0mT&4?q|^)9#zaRD-e!i&Hz#Os}*&dta9HxH{FyKO)hXtV0CsXZnLPk!=l;76ieJy
z+~dCD0SQ6rSb8>{$mSBMe0F@gH=mu(<P{HfjyG0~?-7gc7prQ$Z#b(@5t=XV&&|X}
z(zBUZs~$GR<K+@x!7AOVFULF<Lg!9sZE(K@)>UrTy`bKKk0Kgr(nN#ClDg{$@oaf*
zFfNux;)TE~y5hdZaFs{(3(DSO#r=)pnsC4)<l%p3yv?g#>wnK@{92C<9ve0AnoYX@
zQ3qT>h3h;@;suX*c#Ez)!e+#3K9gvHsMaE#L9vDs+?V!XPmAcIO-#@so|4o*9Qu}>
nKTO)}wAuBWh%SDSEdNQw`axagrYO5L<kw%<tlt)0TeSWIwrF}k

delta 636
zcmW-f*-leY6o$WjI-JevHmOBzVziV55Xw*mR0dH{a2{}Ca;#9W6k0fxNktr<z?>`Z
zd<7*Q6OE1Ddglw6_yU@E=NR{9C;MM({p-)aR<iexs2^Sb^zUsMXy>UzBb^m=(JeXT
z(8FQL5u09{J_nnl4q=WN=(ibgh|p=^xa5T7q{AsrOU@YTtmK^Jypdjz44T$O$t4pn
z8@M95YT}TF4u*|x#Aei?%J^3?W?)2eO>*7nZb)uQZW-&_l8ntAoAGDw$F@!A?F7!i
z%6N9Jlq(h%Y_eXXNJg4ywwY8+an~CX)#03Cn!L9r>Z48M6-~@2W+@2b-iJ^;q$o1y
zeHI<D3B^3FKsbs8BS?5(t%UboIF-vqH=mx(6|&=QX0oIxvFHt1iM}P41y*mbVue-3
zJyuPbRNUu*VvUE2b(#g0)0w4AI#)~&y17DW*v*x)uHup2>$O!Ec+9Hz#j4pF87(d*
zr!q^~WS6!m@?>Loplns9^y8RgA@ugm8e6<?p&iv}&4qOZ0V>$bKCNicvhA7;f|%W?
z4X4C~{!}^if~r)YHCE$O`<%8{SgBxZtS%PviTVUzYT_M{(Ko2r9-l3#vQK@iL1#WO
z)88C!#<}eBKHB-7ZZV@jNvmcORQzS$rp>1P4{@FRrf=sj;?_?ZsuS$jnxJ0tfW8Me
HeLDUF=bUsR

diff --git a/makepatch.java b/makepatch.java
index 201da0d..14e1186 100644
--- a/makepatch.java
+++ b/makepatch.java
@@ -54,6 +54,10 @@ if(args[0].equalsIgnoreCase("chop"))
 System.out.println(args[1].replace("eclipse/cauldron/src/main/java/",""));
 return;
 }
+else if(args[0].equalsIgnoreCase("dir"))
+{
+System.out.println(args[1].substring(0,args[1].lastIndexOf("/")));
+}
 }
 else
 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 9c42f5e..5028319 100755
--- a/makepatch.sh
+++ b/makepatch.sh
@@ -17,8 +17,8 @@ then
 	PATCH=`find patches/ | grep -i $FILE`
 	if [[ -z "$PATCH" ]]
 	then
-		PATCH = "patches/$FILE"
-		mkdir -p $PATCH
+		PATCH="patches/$FILE.patch"
+		mkdir -p `java makepatch dir $FILE`
 		touch $PATCH
 	fi
 	echo "Diff patch of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} below."
@@ -32,8 +32,8 @@ then
 	PATCH=`find patches/ | grep -i $FILE`
 	if [[ -z "$PATCH" ]]
 	then
-		PATCH = "patches/$FILE"
-		mkdir -p $PATCH
+		PATCH="patches/$FILE.patch"
+		mkdir -p `java makepatch dir $FILE`
 		touch $PATCH
 	fi
 	git diff --no-prefix --no-index --text $CLEAN $CAULD > $PATCH
@@ -47,8 +47,8 @@ else
 	PATCH=`find patches/ | grep -i $FILE`
 	if [[ -z "$PATCH" ]]
 	then
-		PATCH = "patches/$FILE"
-		mkdir -p $PATCH
+		PATCH="patches/$FILE.patch"
+		mkdir -p `java makepatch dir $FILE`
 		touch $PATCH
 	fi
 	git diff --no-prefix --text --no-index $CLEAN $CAULD > $PATCH