From 7fa646aac1a8578c5b1d005a3c20da42fadbc475 Mon Sep 17 00:00:00 2001
From: ghidravore <ghidravore@users.noreply.github.com>
Date: Thu, 4 Apr 2019 14:27:22 -0400
Subject: [PATCH] changes for patch directory

---
 .../src/main/java/ghidra/GhidraLauncher.java      | 15 ++++++---------
 gradleScripts/distribution.gradle                 |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
index 9a066d6c0d..381dc1ad25 100644
--- a/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
+++ b/Ghidra/Framework/Utility/src/main/java/ghidra/GhidraLauncher.java
@@ -56,7 +56,7 @@ public class GhidraLauncher {
 			addExternalJarPaths(classpathList, layout.getApplicationRootDirs());
 		}
 		else {
-			addPatchPaths(classpathList, layout.getApplicationRootDirs());
+			addPatchPaths(classpathList, layout.getApplicationInstallationDir());
 			addModuleJarPaths(classpathList, layout.getModules());
 		}
 		classpathList = orderClasspath(classpathList);
@@ -79,19 +79,16 @@ public class GhidraLauncher {
 	}
 
 	/**
-	 * Add bin patch directories and lib patch jars to the given path list.  This should be done
+	 * Add patch jars to the given path list.  This should be done
 	 * first so they take precedence in the classpath.
 	 * 
 	 * @param pathList The list of paths to add to.
 	 * @param appRootDirs The application root directories to search.
 	 */
-	private static void addPatchPaths(List<String> pathList, Collection<ResourceFile> appRootDirs) {
-
-		for (ResourceFile rootDir : appRootDirs) {
-			ResourceFile debugLibDir = new ResourceFile(rootDir, "patch");
-			if (debugLibDir.exists()) {
-				pathList.addAll(findJarsInDir(debugLibDir));
-			}
+	private static void addPatchPaths(List<String> pathList, ResourceFile installDir) {
+		ResourceFile patchDir = new ResourceFile(installDir, "Ghidra/patch");
+		if (patchDir.exists()) {
+			pathList.addAll(findJarsInDir(patchDir));
 		}
 	}
 
diff --git a/gradleScripts/distribution.gradle b/gradleScripts/distribution.gradle
index dfa72b3fbe..10b6289462 100644
--- a/gradleScripts/distribution.gradle
+++ b/gradleScripts/distribution.gradle
@@ -398,7 +398,7 @@ task assembleCommon (type: Copy) {
 	////////////////
 	// Patch Readme
 	////////////////
-	from (ROOT_PROJECT_DIR + "/Ghidra/patch") {
+	from (ROOT_PROJECT_DIR + "/GhidraBuild/patch") {
 		into "Ghidra/patch"
 	}