Ad5001/Gitable
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing bugs on WIndows, starting other platforms

Browse source
This commit is contained in:
Ad5001 2016-11-19 11:01:06 +01:00
parent 09f7d8dc9a
commit 17c53d03d5
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.yml
View file

@ -1,4 +1,4 @@
# Welcome to windows Gitable's config ! # Welcome to windows Gitable's config !
# Select here the path of the git executable (if you did # Select here the path of the git executable (if you did
# not modify it while installing git, it should work.) # not modify it while installing git, it should work.)
executable_path: "C:\\Program Files\\Git\\bin\\git.exe" executable_path: "C:\\PROGRA~1\\Git\\bin\\git.exe"

2
resources/win.yml
View file

@ -1,4 +1,4 @@
# Welcome to windows Gitable's config ! # Welcome to windows Gitable's config !
# Select here the path of the git executable (if you did # Select here the path of the git executable (if you did
# not modify it while installing git, it should work.) # not modify it while installing git, it should work.)
executable_path: "C:\\Program Files\\Git\\bin\\git.exe" executable_path: "C:\\PROGRA~1\\Git\\bin\\git.exe"

5
src/Ad5001/Gitable/Windows.php
View file

@ -29,8 +29,9 @@ class Windows extends GitClient {
*/ */
public function gitExec(string $args) : string { public function gitExec(string $args) : string {
chdir($this->dir); chdir($this->dir);
echo "$this->executable " . $args . " ";
$process = proc_open( $process = proc_open(
"\"$this->executable\" " . $args, "$this->executable " . $args,
array( array(
0 => array("pipe", "r"), //S TDIN 0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT 1 => array("pipe", "w"), //S TDOUT
@ -116,7 +117,7 @@ class Windows extends GitClient {
public function initcheck() { public function initcheck() {
$this->executable = $this->main->getConfig()->get("executable_path"); $this->executable = $this->main->getConfig()->get("executable_path");
$process = proc_open( $process = proc_open(
"\"$this->executable\" --version", "$this->executable --version",
array( array(
0 => array("pipe", "r"), //S TDIN 0 => array("pipe", "r"), //S TDIN
1 => array("pipe", "w"), //S TDOUT 1 => array("pipe", "w"), //S TDOUT