adding requested changes (espressif#519)

NatashaLi-ESPRESSIF · Apr 5, 2022 · b154453 · b154453
1 parent acaac8c
commit b154453
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/InstallToolsHandler.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/InstallToolsHandler.java
@@ -72,8 +72,7 @@ protected IStatus run(IProgressMonitor monitor)
 				handleToolsInstallPython();
 				monitor.worked(1);
 
-
-				monitor.setTaskName("Installing websocket_client");
+				monitor.setTaskName(Messages.InstallToolsHandler_InstallingWebscoketMsg);
 				handleWebSocketClientInstall();
 				monitor.worked(1);
 
@@ -92,7 +91,6 @@ protected IStatus run(IProgressMonitor monitor)
 
 				return Status.OK_STATUS;
 			}
-
 		};
 		Preferences scopedPreferenceStore = InstanceScope.INSTANCE.getNode(UIPlugin.PLUGIN_ID);
 		scopedPreferenceStore.putBoolean(INSTALL_TOOLS_FLAG, true);
@@ -105,7 +103,6 @@ protected IStatus run(IProgressMonitor monitor)
 			Logger.log(e);
 		}
 		installToolsJob.schedule();
-
 	}
 
 	private void copyOpenOcdRules()
@@ -205,10 +202,9 @@ protected void handleWebSocketClientInstall()
 		IPath pipPath = new org.eclipse.core.runtime.Path(pythonExecutablenPath); //$NON-NLS-1$
 		String pipPathLastSegment = pipPath.lastSegment().replace("python", "pip"); //$NON-NLS-1$ //$NON-NLS-2$
 		pipPath = pipPath.removeLastSegments(1).append(pipPathLastSegment); 
-
 		if (!pipPath.toFile().exists()) 
 		{
-			console.println("pip executable not found. Unable to run `pip install websocket-client`");
+			console.println(String.format("%s executable not found. Unable to run `%s install websocket-client`", pipPathLastSegment, pipPathLastSegment)); //$NON-NLS-1$
 			return;
 		}
 

diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/Messages.java b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/Messages.java
@@ -29,6 +29,7 @@ public class Messages extends NLS
 	public static String InstallToolsHandler_ConfiguredCMakeMsg;
 	public static String InstallToolsHandler_ExportingPathsMsg;
 	public static String InstallToolsHandler_InstallingPythonMsg;
+	public static String InstallToolsHandler_InstallingWebscoketMsg;
 	public static String InstallToolsHandler_InstallingToolsMsg;
 	public static String InstallToolsHandler_ItWilltakeTimeMsg;
 	public static String InstallToolsHandler_ToolsCompleted;

diff --git a/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/messages.properties b/bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/update/messages.properties
@@ -22,6 +22,7 @@ InstallToolsHandler_ConfiguredBuildEnvVarMsg=Configured CDT Build Environment va
 InstallToolsHandler_ConfiguredCMakeMsg=Configured CMake toolchain. You can check Preferences > C/C++ > CMake
 InstallToolsHandler_ExportingPathsMsg=Exporting and processing tools paths
 InstallToolsHandler_InstallingPythonMsg=Installing Python
+InstallToolsHandler_InstallingWebscoketMsg=Installing websocket_client
 InstallToolsHandler_InstallingToolsMsg=Installing tools...
 InstallToolsHandler_ItWilltakeTimeMsg=This can take a while. Please be patient.
 InstallToolsHandler_ToolsCompleted=Install tools completed.