Skip to content

Commit 98b80be

Browse files
authored
Merge pull request #134 from Achal1607/remove-glob
Removed glob usage from JDK Downloader
2 parents bef8d6e + 0e85830 commit 98b80be

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

vscode/src/jdkDownloader.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import * as vscode from 'vscode';
2424
import * as crypto from 'crypto';
2525
import { handleLog } from './extension';
2626
import { promisify } from 'util';
27-
import * as glob from 'glob';
2827

2928
let customView: vscode.WebviewPanel;
3029
let logger: vscode.OutputChannel;
@@ -190,8 +189,9 @@ export async function extractJDK(jdkTarballPath: string, extractionTarget: strin
190189
const downloadedDir = path.join(__dirname, 'jdk_downloads');
191190

192191
// Remove already present version of a particular JDK from temp dir
193-
const oldTempExtractedDirs = glob.sync(`jdk-${jdkVersion}*`, { cwd: downloadedDir });
194-
for await (const oldDirName of oldTempExtractedDirs) {
192+
const oldDirs = await fs.promises.readdir(downloadedDir);
193+
const matchingOldDirs = oldDirs.filter(file => file.startsWith(`jdk-${jdkVersion}`));
194+
for await (const oldDirName of matchingOldDirs) {
195195
await fs.promises.rmdir(path.join(downloadedDir, oldDirName), { recursive: true });
196196
}
197197

@@ -204,7 +204,9 @@ export async function extractJDK(jdkTarballPath: string, extractionTarget: strin
204204
if (error) {
205205
vscode.window.showErrorMessage('Error: ' + error);
206206
} else {
207-
const tempDirName = glob.sync(`jdk-${jdkVersion}*`, { cwd: downloadedDir })?.[0];
207+
const dirsPresent = await fs.promises.readdir(downloadedDir);
208+
const matchingJdkDir = dirsPresent.filter(file => file.startsWith(`jdk-${jdkVersion}`));
209+
const tempDirName = matchingJdkDir[0] || "";
208210
tempDirectoryPath = path.join(downloadedDir, tempDirName);
209211
// If directory with same name is present in the user selected download location then ask user if they want to delete it or not?
210212
const newDirName = `${jdkType.split(' ').join('_')}-${jdkVersion}`;

0 commit comments

Comments
 (0)