IEP-1529: Fix for system python executable (#1239)

* IEP-1552: Fix for system python executable

Author: alirana01

bundles/com.espressif.idf.core/src/com/espressif/idf/core/tools/SetupToolsInIde.java

@@ -231,7 +231,7 @@ private IStatus handleWebSocketClientInstall()
 		String websocketClient = "websocket-client"; //$NON-NLS-1$
 		// pip install websocket-client
 		List<String> arguments = new ArrayList<String>();
-		final String pythonEnvPath = IDFUtil.getIDFPythonEnvPath(envVarsFromActivationScriptMap.get(IDFEnvironmentVariables.IDF_PYTHON_ENV_PATH));
+		final String pythonEnvPath = idfInstalled.getPython();
 		if (pythonEnvPath == null || !new File(pythonEnvPath).exists())
 		{
 			log(String.format("%s executable not found. Unable to run `%s -m pip install websocket-client`", //$NON-NLS-1$
@@ -331,10 +331,8 @@ private IStatus loadTargetsAvailableFromIdfInCurrentToolSet(boolean rollback)
 	{
 		List<String> arguments = new ArrayList<String>();
 		arguments.add(rollback
-				? IDFUtil.getIDFPythonEnvPath(
-						existingEnvVarsInIdeForRollback.get(IDFEnvironmentVariables.IDF_PYTHON_ENV_PATH))
-				: IDFUtil.getIDFPythonEnvPath(
-						envVarsFromActivationScriptMap.get(IDFEnvironmentVariables.IDF_PYTHON_ENV_PATH)));
+				? existingEnvVarsInIdeForRollback.get(IDFEnvironmentVariables.PYTHON_EXE_PATH)
+				: idfInstalled.getPython());
 		arguments
 				.add(IDFUtil
 						.getIDFPythonScriptFile(
@@ -479,6 +477,8 @@ private void setupEnvVarsInEclipse()
 		idfEnvironmentVariables.addEnvVariable(IDFEnvironmentVariables.IDF_MAINTAINER, "1"); //$NON-NLS-1$
 		idfEnvironmentVariables.addEnvVariable(IDFEnvironmentVariables.ESP_IDF_EIM_ID, idfInstalled.getId());
 
+		idfEnvironmentVariables.addEnvVariable(IDFEnvironmentVariables.PYTHON_EXE_PATH, idfInstalled.getPython());
+		
 		IDFUtil.updateEspressifPrefPageOpenocdPath();
 	}
 

bundles/com.espressif.idf.core/src/com/espressif/idf/core/util/IDFUtil.java

@@ -187,50 +187,8 @@ public static String getIDFPath()
 	 */
 	public static String getIDFPythonEnvPath()
 	{
-		String idfPyEnvPath = new IDFEnvironmentVariables().getEnvValue(IDFEnvironmentVariables.IDF_PYTHON_ENV_PATH);
-		idfPyEnvPath = idfPyEnvPath.strip();
-		if (!StringUtil.isEmpty(idfPyEnvPath))
-		{
-
-			if (Platform.getOS().equals(Platform.OS_WIN32))
-			{
-				idfPyEnvPath = idfPyEnvPath + "/" + "Scripts"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			else
-			{
-				idfPyEnvPath = idfPyEnvPath + "/" + "bin"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			java.nio.file.Path commandPath = findCommand(IDFConstants.PYTHON_CMD, idfPyEnvPath);
-			if (commandPath != null)
-			{
-				return commandPath.toFile().getAbsolutePath();
-			}
-		}
-		return findCommandFromBuildEnvPath(IDFConstants.PYTHON_CMD);
-
-	}
-	
-	public static String getIDFPythonEnvPath(String idfPyEnvPath)
-	{
-		idfPyEnvPath = idfPyEnvPath.strip();
-		if (!StringUtil.isEmpty(idfPyEnvPath))
-		{
-
-			if (Platform.getOS().equals(Platform.OS_WIN32))
-			{
-				idfPyEnvPath = idfPyEnvPath + "/" + "Scripts"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			else
-			{
-				idfPyEnvPath = idfPyEnvPath + "/" + "bin"; //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			java.nio.file.Path commandPath = findCommand(IDFConstants.PYTHON_CMD, idfPyEnvPath);
-			if (commandPath != null)
-			{
-				return commandPath.toFile().getAbsolutePath();
-			}
-		}
-		return findCommandFromBuildEnvPath(IDFConstants.PYTHON_CMD);
+		IDFEnvironmentVariables idfEnvironmentVariables = new IDFEnvironmentVariables();
+		return idfEnvironmentVariables.getEnvValue(IDFEnvironmentVariables.PYTHON_EXE_PATH);
 
 	}
 
@@ -250,17 +208,8 @@ public static boolean checkIfIdfSupportsSpaces()
 
 	public static String getPythonExecutable()
 	{
-		IPath pythonPath = new SystemExecutableFinder().find(IDFConstants.PYTHON3_CMD); // look for python3
-		if (pythonPath == null)
-		{
-			pythonPath = new SystemExecutableFinder().find(IDFConstants.PYTHON_CMD); // look for python
-		}
-		if (pythonPath != null)
-		{
-			return pythonPath.toOSString();
-		}
-
-		return IDFConstants.PYTHON_CMD;
+		IDFEnvironmentVariables idfEnvironmentVariables = new IDFEnvironmentVariables();
+		return idfEnvironmentVariables.getEnvValue(IDFEnvironmentVariables.PYTHON_EXE_PATH);
 	}
 
 	/**