Fixes updated issues for #13

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");
 
 }
 

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`