From 8cd30ffdfe3c6d09055e7de3a3c942ae1200ce92 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sat, 15 Mar 2014 12:57:06 +0700 Subject: [PATCH] Windows fixes --- PHPCI/Helper/CommandExecutor.php | 2 +- PHPCI/Model/Build/LocalBuild.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PHPCI/Helper/CommandExecutor.php b/PHPCI/Helper/CommandExecutor.php index 70bfcff5..2e88b938 100644 --- a/PHPCI/Helper/CommandExecutor.php +++ b/PHPCI/Helper/CommandExecutor.php @@ -127,7 +127,7 @@ class CommandExecutor } // Use "where" for windows and "which" for other OS - $findCmd = IS_WIN ? 'which' : 'where'; + $findCmd = IS_WIN ? 'where' : 'which'; $findCmdResult = trim(shell_exec($findCmd . ' ' . $bin)); if (!empty($findCmdResult)) { diff --git a/PHPCI/Model/Build/LocalBuild.php b/PHPCI/Model/Build/LocalBuild.php index 1148b72e..e5837595 100644 --- a/PHPCI/Model/Build/LocalBuild.php +++ b/PHPCI/Model/Build/LocalBuild.php @@ -46,7 +46,7 @@ class LocalBuild extends Build } else { $cmd = 'cp -Rf "%s" "%s/"'; if (IS_WIN) { - $cmd = 'copy /Y "%s" "%s/"'; + $cmd = 'xcopy /E /Y "%s" "%s/*"'; } $builder->executeCommand($cmd, $reference, $buildPath); }