Skip to content

Several Windows fixes. #23

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 6 commits into from
Jun 30, 2017
Merged

Several Windows fixes. #23

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c9ba19
Only change to a drive letter first, if it is an absolute path on Win…
angrybrad Feb 9, 2017
aac2452
Fix a bug where quoted absolute paths on Windows wouldn't work. i.e. …
angrybrad Feb 9, 2017
1bc32b7
Fix a bug where the right syntax wasn't being used to change drives o…
angrybrad Feb 9, 2017
ae92d1c
Use the correct syntax to make sure you're on the right drive letter …
angrybrad Feb 10, 2017
24ed4ed
Did not mean to remove escapeshellarg in ae92d1ceca2af4f7.
angrybrad Feb 10, 2017
c12ae7b
Move $position into its own else block and default it to false instea…
angrybrad Jun 29, 2017
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
15 changes: 13 additions & 2 deletions src/Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,19 @@ public function setCommand($command)
}
if ($this->getIsWindows()) {
// Make sure to switch to correct drive like "E:" first if we have a full path in command
$chdrive = (isset($command[1]) && $command[1]===':') ? $command[0].': && ' : '';
$command = sprintf($chdrive.'cd %s && %s', escapeshellarg(dirname($command)), basename($command));
if (isset($command[1]) && $command[1]===':') {
$position = 1;
// Could be a quoted absolute path because of spaces. i.e. "C:\Program Files (x86)\file.exe"
} elseif (isset($command[2]) && $command[2]===':') {
$position = 2;
} else {
$position = false;
}

// Absolute path. If it's a relative path, let it slide.
if ($position) {
$command = sprintf($command[$position - 1].': && cd %s && %s', escapeshellarg(dirname($command)), basename($command));
}
}
$this->_command = $command;
return $this;
Expand Down