From 9857ade2fe02aa6df815e1f98332f67c3e179783 Mon Sep 17 00:00:00 2001
From: ghidravore <ghidravore@users.noreply.github.com>
Date: Wed, 3 Apr 2019 17:04:56 -0400
Subject: [PATCH] changed patch directory and updated distribution.gradle to
 copy patch/README.txt

---
 .../Utility/src/main/java/ghidra/GhidraLauncher.java     | 8 +-------
 gradleScripts/distribution.gradle                        | 9 ++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
index c21a749dd7..9a066d6c0d 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
@@ -88,13 +88,7 @@ public class GhidraLauncher {
 	private static void addPatchPaths(List<String> pathList, Collection<ResourceFile> appRootDirs) {
 
 		for (ResourceFile rootDir : appRootDirs) {
-
-			ResourceFile dir = new ResourceFile(rootDir, "bin");
-			if (dir.exists()) {
-				pathList.add(dir.getAbsolutePath());
-			}
-
-			ResourceFile debugLibDir = new ResourceFile(rootDir, "lib");
+			ResourceFile debugLibDir = new ResourceFile(rootDir, "patch");
 			if (debugLibDir.exists()) {
 				pathList.addAll(findJarsInDir(debugLibDir));
 			}
diff --git a/gradleScripts/distribution.gradle b/gradleScripts/distribution.gradle
index 15260c088c..dfa72b3fbe 100644
--- a/gradleScripts/distribution.gradle
+++ b/gradleScripts/distribution.gradle
@@ -394,7 +394,14 @@ task assembleCommon (type: Copy) {
 		into "Ghidra"
 		filter (ConcatFilter, prepend: buildDateFile)
 	}
-		
+
+	////////////////
+	// Patch Readme
+	////////////////
+	from (ROOT_PROJECT_DIR + "/Ghidra/patch") {
+		into "Ghidra/patch"
+	}		
+	
 	/////////////////
 	// GLOBALS
 	/////////////////