IEP-878: Fixing the git warning (#733)

I have fixed the git warning issue and possibly this will also fix the git spawn error. Further also reverted to a deprecated method for support with older cdt for PersistentPreferences class
espressif · Apr 4, 2023 · 76fcbd7 · 76fcbd7
1 parent fb441d0
commit 76fcbd7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...tag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java b/...tag.openocd/src/com/espressif/idf/debug/gdbjtag/openocd/ui/preferences/GlobalMcuPage.java
@@ -111,7 +111,7 @@ protected void createFieldEditors()
 	public boolean performOk()
 	{
 		boolean result = super.performOk();
-		Path updatedPath = Paths.get(fPersistentPreferences.getInstallFolder(StringUtil.EMPTY)).getParent();
+		Path updatedPath = Paths.get(fPersistentPreferences.getInstallFolder()).getParent();
 		if (updatedPath != null)
 		{
 			updatedPath = updatedPath.resolve("share").resolve("openocd").resolve("scripts"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/ListInstalledToolsHandler.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/ListInstalledToolsHandler.java
@@ -13,6 +13,7 @@
 import org.eclipse.swt.widgets.Display;
 
 import com.espressif.idf.core.IDFConstants;
+import com.espressif.idf.core.IDFEnvironmentVariables;
 import com.espressif.idf.core.logging.Logger;
 import com.espressif.idf.core.util.IDFUtil;
 import com.espressif.idf.core.util.StringUtil;
@@ -77,7 +78,11 @@ protected void execute()
 	{
 		List<String> arguments = new ArrayList<String>();
 		arguments.add(IDFConstants.TOOLS_LIST_CMD);
-
+		if (StringUtil.isEmpty(gitExecutablePath))
+		{
+			gitExecutablePath = new IDFEnvironmentVariables().getEnvValue(IDFEnvironmentVariables.GIT_PATH);
+		}
+
 		runCommand(arguments, console);
 	}