Skip to content

Commit

Permalink
Bugfix linuxmac (#1)
Browse files Browse the repository at this point in the history
* Bug fixes

* Indentation Change
  • Loading branch information
saichand345 committed Jun 15, 2018
1 parent 864abda commit c1f23b2
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 20 deletions.
3 changes: 1 addition & 2 deletions src/commands/build-application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ export async function buildGradleApplication() {

export async function buildCSharpApplication(showTerminal:boolean) {
var uris: vscode.Uri[] = null;
if (vars._isWindows)
uris = await vscode.workspace.findFiles('**/build' + builScriptExtension);
uris = await vscode.workspace.findFiles('**/build' + builScriptExtension);
if (uris.length < 1) {
vscode.window.showErrorMessage("A build file was not found in the workspace");
return 1;
Expand Down
10 changes: 4 additions & 6 deletions src/commands/deploy-application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,10 @@ export async function deployApplication() {

async function installApplication(terminal:vscode.Terminal) {
var uri: vscode.Uri[] = null;
if (vars._isWindows) {
uri = await vscode.workspace.findFiles('**/install' + installScriptExtension);
if (uri.length < 1) {
vscode.window.showErrorMessage("An install file was not found in the workspace");
return;
}
uri = await vscode.workspace.findFiles('**/install' + installScriptExtension);
if (uri.length < 1) {
vscode.window.showErrorMessage("An install file was not found in the workspace");
return;
}
const relativeInstallPath = vscode.workspace.asRelativePath(uri[0]);
terminal.sendText('./' + relativeInstallPath);
Expand Down
10 changes: 4 additions & 6 deletions src/commands/publish-application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,10 @@ async function deployToSecureClusterCert(clusterInfo) {
async function installApplication() {
console.log("Install Application");
var uri: vscode.Uri[] = null;
if (vars._isWindows) {
uri = await vscode.workspace.findFiles('**/install' + installScriptExtension);
if (uri.length < 1) {
vscode.window.showErrorMessage("An install file was not found in the workspace");
return;
}
uri = await vscode.workspace.findFiles('**/install' + installScriptExtension);
if (uri.length < 1) {
vscode.window.showErrorMessage("An install file was not found in the workspace");
return;
}
const relativeInstallPath = vscode.workspace.asRelativePath(uri[0]);
const terminal: vscode.Terminal = vscode.window.createTerminal('ServiceFabric');
Expand Down
10 changes: 4 additions & 6 deletions src/commands/remove-application.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,10 @@ async function connectToUnsecureCluster(clusterInfo) {

async function uninstallApplication(terminal:vscode.Terminal) {
var uri: vscode.Uri[] = null;
if (vars._isWindows) {
uri = await vscode.workspace.findFiles('**/uninstall' + installScriptExtension);
if (uri.length < 1) {
vscode.window.showErrorMessage("An uninstall file was not found in the workspace");
return;
}
uri = await vscode.workspace.findFiles('**/uninstall' + installScriptExtension);
if (uri.length < 1) {
vscode.window.showErrorMessage("An uninstall file was not found in the workspace");
return;
}
const relativeInstallPath = vscode.workspace.asRelativePath(uri[0]);
terminal.sendText('./' + relativeInstallPath);
Expand Down

0 comments on commit c1f23b2

Please sign in to comment.