Skip to content

Commit

Permalink
Merge pull request #207 from lorisleiva/revert-pr-199
Browse files Browse the repository at this point in the history
Revert PR #199
  • Loading branch information
lorisleiva authored Sep 17, 2020
2 parents a367c15 + 441b129 commit a8feae3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/LaravelDeployer/ConfigFileBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class ConfigFileBuilder
public function __construct()
{
$basePath = base_path();
$this->set('options.repository', exec("cd \"$basePath\" && git config --get remote.origin.url") ?? '');
$this->set('options.repository', exec("cd $basePath && git config --get remote.origin.url") ?? '');

$lumen = preg_match('/Lumen/', app()->version());
$this->set('hooks.ready', $lumen ? $this->lumenHooks : $this->laravelHooks);
Expand Down
2 changes: 1 addition & 1 deletion src/strategy/firstdeploy.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@

$question = "Are you sure you want to continue and delete those elements?";
if (get('debug', false) || askConfirmation($question, false)) {
run("cd \"{{deploy_path}}\" && rm -rf $filesToDelete");
run("cd {{deploy_path}} && rm -rf $filesToDelete");
}
});
2 changes: 1 addition & 1 deletion src/strategy/pull.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
throw new \Exception("There is no `current` folder to execute a `git pull` from.\nPlease choose another strategy to deploy your application before using the `pull` strategy");
}

run('cd "{{deploy_path}}/current" && git pull');
run('cd {{deploy_path}}/current && git pull');
});
2 changes: 1 addition & 1 deletion src/task/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,5 +87,5 @@
if (!commandExist('unzip')) {
writeln('<comment>To speed up composer installation setup "unzip" command with PHP zip extension https://goo.gl/sxzFcD</comment>');
}
run('cd "{{release_path}}" && {{bin/composer}} {{composer_options}}');
run('cd {{release_path}} && {{bin/composer}} {{composer_options}}');
});
2 changes: 1 addition & 1 deletion src/task/logs.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@

desc('Read logs from a given host');
task('logs', function() {
writeln(run('cd "{{deploy_path}}/current" && {{log_command}}'));
writeln(run('cd {{deploy_path}}/current && {{log_command}}'));
})->shallow();

0 comments on commit a8feae3

Please sign in to comment.