feat: Highlight 32 bit client tools

Enable Stale Bot Fixed issue loading client tools when target is unavailable fixes #274 Signed-off-by: Gordon Smith <GordonJSmith@gmail.com>
hpcc-systems · Aug 6, 2021 · e2d8961 · e2d8961
1 parent f11ea65
commit e2d8961
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/ecl/hpccResources.ts b/src/ecl/hpccResources.ts
@@ -177,7 +177,7 @@ class ClientToolsTree extends Tree {
         ]).then(([clientTools, allClientTools]) => {
             this._treeView.title = localize("Client Tools");
             return allClientTools.map(ct => {
-                return new ClientToolsItem(this, ct, ct.eclccPath === eclccPath, ct.binPath === clientTools.binPath);
+                return new ClientToolsItem(this, ct, ct.eclccPath === eclccPath, ct.binPath === clientTools?.binPath);
             });
         });
     }
@@ -190,7 +190,8 @@ class ClientToolsItem extends Item<ClientToolsTree> {
     }
 
     getLabel() {
-        return this.clientTools.versionSync().toString();
+        const x86 = this.clientTools.binPath.indexOf("(x86)") >= 0 ? "(x86)" : "";
+        return `${this.clientTools.versionSync().toString()} ${x86}`;
     }
 
     iconPath() {

diff --git a/src/hpccplatform/launchConfig.ts b/src/hpccplatform/launchConfig.ts
@@ -428,6 +428,8 @@ export class LaunchConfig implements LaunchRequestArguments {
         return this.fetchBuild().then(build => {
             logger.info(`Locating Client Tools.${os.EOL}`);
             return this.locateClientTools(undefined, build);
+        }).catch(e => {
+            return undefined;
         });
     }