From 17c53d03d53c36817ec8861d2d38e8c9ba5d188a Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 19 Nov 2016 11:01:06 +0100 Subject: [PATCH] Fixing bugs on WIndows, starting other platforms --- config.yml | 2 +- resources/win.yml | 2 +- src/Ad5001/Gitable/Windows.php | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config.yml b/config.yml index 945411d..c30fe0e 100644 --- a/config.yml +++ b/config.yml @@ -1,4 +1,4 @@ # Welcome to windows Gitable's config ! # Select here the path of the git executable (if you did # not modify it while installing git, it should work.) -executable_path: "C:\\Program Files\\Git\\bin\\git.exe" \ No newline at end of file +executable_path: "C:\\PROGRA~1\\Git\\bin\\git.exe" \ No newline at end of file diff --git a/resources/win.yml b/resources/win.yml index 945411d..c30fe0e 100644 --- a/resources/win.yml +++ b/resources/win.yml @@ -1,4 +1,4 @@ # Welcome to windows Gitable's config ! # Select here the path of the git executable (if you did # not modify it while installing git, it should work.) -executable_path: "C:\\Program Files\\Git\\bin\\git.exe" \ No newline at end of file +executable_path: "C:\\PROGRA~1\\Git\\bin\\git.exe" \ No newline at end of file diff --git a/src/Ad5001/Gitable/Windows.php b/src/Ad5001/Gitable/Windows.php index d89aa04..9640df3 100644 --- a/src/Ad5001/Gitable/Windows.php +++ b/src/Ad5001/Gitable/Windows.php @@ -29,8 +29,9 @@ class Windows extends GitClient { */ public function gitExec(string $args) : string { chdir($this->dir); + echo "$this->executable " . $args . " "; $process = proc_open( - "\"$this->executable\" " . $args, + "$this->executable " . $args, array( 0 => array("pipe", "r"), //S TDIN 1 => array("pipe", "w"), //S TDOUT @@ -116,7 +117,7 @@ class Windows extends GitClient { public function initcheck() { $this->executable = $this->main->getConfig()->get("executable_path"); $process = proc_open( - "\"$this->executable\" --version", + "$this->executable --version", array( 0 => array("pipe", "r"), //S TDIN 1 => array("pipe", "w"), //S TDOUT