Skip to content

Commit d613171

Browse files
committed
JBDS-4366 CDK installation fails when MINISHIFT_HOME is specified
1 parent bd2713f commit d613171

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

browser/model/cdk.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ class CDKInstall extends InstallableItem {
5757
}).then(()=> {
5858
return Platform.getUserHomePath();
5959
}).then((result)=> {
60-
home = result;
61-
return globby(ocExePattern, {root: path.join(home, '.minishift', 'cache', 'oc')});
60+
home = Platform.ENV.MINISHIFT_HOME ? Platform.ENV.MINISHIFT_HOME : path.join(result, '.minishift');
61+
return globby(ocExePattern, {root: path.join(home, 'cache', 'oc')});
6262
}).then((files)=> {
6363
ocExe = files[0].replace(/\//g, path.sep);
6464
return Promise.resolve();
@@ -68,7 +68,7 @@ class CDKInstall extends InstallableItem {
6868
return Platform.addToUserPath([ocExe, minishiftExe]);
6969
}).then(()=> {
7070
return pify(fs.appendFile)(
71-
path.join(home, '.minishift', 'cdk'),
71+
path.join(home, 'cdk'),
7272
`rhel.subscription.username=${this.installerDataSvc.username}`);
7373
}).then(()=> {
7474
installer.succeed(true);

0 commit comments

Comments
 (0)