Skip to content

Commit 3db06a9

Browse files
committed
Changed the way the global install pick is defined
1 parent 282516a commit 3db06a9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/setup_utilities/workspace-setup.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,11 +811,10 @@ export async function westConfig(
811811
detail: "new-install"
812812
});
813813

814-
const globalPath = getToolsDir();
815814
externalOptions.push({
816815
label: "$(link) Global Installation",
817816
description: "Use or create the global Zephyr installation",
818-
detail: globalPath
817+
detail: "global-install",
819818
});
820819

821820
const existingInstalls = await getExistingInstallationPicks(wsConfig, globalConfig);
@@ -857,7 +856,8 @@ export async function westConfig(
857856
}
858857
chosenPath = folderUris[0].fsPath;
859858
needsSetup = true;
860-
} else if (chosenPath === globalPath) {
859+
} else if (chosenPath === "global-install") {
860+
chosenPath = getToolsDir();
861861
needsSetup = !(globalConfig.setupStateDictionary && globalConfig.setupStateDictionary[chosenPath]);
862862
} else {
863863
needsSetup = !(globalConfig.setupStateDictionary && globalConfig.setupStateDictionary[chosenPath]);

src/test/workspace-out-of-tree.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ suite("Workspace Out Of Tree Test Suite", () => {
124124
uiMock.primeInteractions([
125125
{ type: 'input', value: '--branch no_west -- https://github.com/mylonics/zephyr-ide-samples.git', description: 'Enter git clone string for no_west branch' },
126126
{ type: 'quickpick', value: 'use-external-installation', description: 'Choose Use Existing Zephyr Installation option' },
127-
{ type: 'quickpick', value: 'global', description: 'Choose Global Installation option' },
127+
{ type: 'quickpick', value: 'global-install', description: 'Choose Global Installation option' },
128128
{ type: 'quickpick', value: 'minimal', description: 'Select minimal manifest' },
129129
{ type: 'quickpick', value: 'stm32', description: 'Select STM32 toolchain' },
130130
{ type: 'quickpick', value: 'v4.2.0', description: 'Select default configuration' },

0 commit comments

Comments
 (0)