Skip to content

fix for windows spaces, needs testing #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 8, 2015
Merged

fix for windows spaces, needs testing #78

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62b01f9
fix for windows spaces, needs testing
taiwanesePortrait Nov 7, 2015
f0c7cf2
more fixes for spaces
taiwanesePortrait Nov 7, 2015
b6d28cb
start working with quotes
taiwanesePortrait Nov 7, 2015
51986b7
spaces working on osx now for open in ide
taiwanesePortrait Nov 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions projectGeneratorElectron/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,12 @@ ipc.on('update', function(event, arg) {
var pgApp = pathTemp.normalize(pathTemp.join(pathTemp.join(__dirname, "app"), "projectGenerator"));


pgApp = pgApp.replace(/ /g, '\\ ');

if( arg.platform == 'osx' || arg.platform == 'linux' || arg.platform == 'linux64' ){
pgApp = pgApp.replace(/ /g, '\\ ');
} else {
pgApp = "\"" + pgApp + "\"";
}

var wholeString = pgApp + " " + recursiveString + " " + verboseString + " " + pathString + " " + platformString + " " + updatePath;

exec(wholeString, function callback(error, stdout, stderr) {
Expand Down Expand Up @@ -646,7 +650,11 @@ ipc.on('generate', function(event, arg) {
pgApp = pathTemp.normalize(pathTemp.join(pathTemp.join(__dirname, "app"), "projectGenerator"));
}

pgApp = pgApp.replace(/ /g, '\\ ');
if( arg.platform == 'osx' || arg.platform == 'linux' || arg.platform == 'linux64' ){
pgApp = pgApp.replace(/ /g, '\\ ');
} else {
pgApp = pgApp = "\"" + pgApp + "\"";
}

var wholeString = pgApp + " " + verboseString + " " + pathString + " " + addonString + " " + platformString + " " + projectString;

Expand Down Expand Up @@ -799,17 +807,14 @@ ipc.on('launchProjectinIDE', function(event, arg) {
if( arg.platform == 'osx' ){
var osxPath = pathTemp.join(fullPath, arg['projectName'] + '.xcodeproj');
console.log( osxPath );
if( fsTemp.statSync(osxPath).isDirectory() == true ){ // note: .xcodeproj is a folder, not a file
var exec = require('child_process').exec;
exec('open ' + osxPath, function callback(error, stdout, stderr){
return;
});
}
else {
console.log('OSX project file not found!');
}
osxPath = "\"" + osxPath + "\"";
var exec = require('child_process').exec;
exec('open ' + osxPath, function callback(error, stdout, stderr){
return;
});
} else if( arg.platform == 'linux' || arg.platform == 'linux64' ){
var linuxPath = pathTemp.join(fullPath, arg['projectName'] + '.qbs');
linuxPath = linuxPath.replace(/ /g, '\\ ');
console.log( linuxPath );
var exec = require('child_process').exec;
exec('xdg-open ' + linuxPath, function callback(error, stdout, stderr){
Expand All @@ -818,8 +823,9 @@ ipc.on('launchProjectinIDE', function(event, arg) {
} else {
var windowsPath = pathTemp.join(fullPath, arg['projectName'] + '.sln');
console.log( windowsPath );
windowsPath = "\"" + windowsPath + "\"";
var exec = require('child_process').exec;
exec('start ' + windowsPath, function callback(error, stdout, stderr){
exec('start ' + "\"\"" + " " + windowsPath, function callback(error, stdout, stderr){
return;
});
}
Expand Down