Skip to content

Commit 50ed3b3

Browse files
committed
Fix odo for windows unpack issue
It seems odo archive for windows has zip fomat instead of zgip. Signed-off-by: Denis Golovin dgolovin@redhat.com
1 parent 88ca642 commit 50ed3b3

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

build/archive.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ export class Archive {
2020
): Promise<void> {
2121
return new Promise((resolve, reject) => {
2222
if (zipFile.endsWith('.tar.gz')) {
23-
Archive.untar(zipFile, extractTo, cmdFileName, prefix)
24-
.then(resolve)
25-
.catch(reject);
23+
if (zipFile.includes('windows')) {
24+
Archive.unzip(zipFile, extractTo, cmdFileName)
25+
.then(resolve)
26+
.catch(reject);
27+
} else {
28+
Archive.untar(zipFile, extractTo, cmdFileName, prefix)
29+
.then(resolve)
30+
.catch(reject);
31+
}
2632
} else if (zipFile.endsWith('.gz')) {
2733
Archive.gunzip(zipFile, extractTo)
2834
.then(resolve)

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,10 +1280,10 @@
12801280
"description": "Force extension to search for `oc` and `odo` CLI tools in PATH locations before using bundled binaries."
12811281
},
12821282
"openshiftConnector.useWebviewInsteadOfTerminalView": {
1283-
"Title": "Use Webview based editors to show 'Show Log', 'Follow Log' and 'Describe' commands output",
1283+
"Title": "Use Webview based editors to show 'Show Log', 'Follow Log', 'Watch Log' and 'Describe' commands output",
12841284
"type": "boolean",
12851285
"default": false,
1286-
"description": "By default the Terminal View is used to execute OpenShift 'Show Log', 'Follow Log' and 'Describe' commands. Select this option if you want to use Webview based editors for it."
1286+
"description": "By default the Terminal View is used to execute OpenShift 'Show Log', 'Follow Log', 'Watch Log' and 'Describe' commands. Select this option if you want to use Webview based editors for it."
12871287
},
12881288
"openshiftConnector.crcBinaryLocation": {
12891289
"Title": "CRC Executable Location",

0 commit comments

Comments
 (0)