Skip to content

Improved error checking #2

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

Open
xaqrox wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improved error checking #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9ae6b7
Improved error checking
xaqrox Mar 22, 2023
0a784c6
Forgot a negation.
xaqrox Mar 22, 2023
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
38 changes: 18 additions & 20 deletions wp-cli-sync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ function lb_cr() {
$ssh_hostname = $_ENV['REMOTE_SSH_HOSTNAME'];
$ssh_username = $_ENV['REMOTE_SSH_USERNAME'];
$rem_proj_loc = $_ENV['REMOTE_PROJECT_DIR'];
$ssh_port = $_ENV['REMOTE_PORT'] ?? false;
$ssh_port_command = $ssh_port ? ' -p ' . $ssh_port . ' ' : '';
$rsync_port_command = $ssh_port ? ' -e "ssh -p 18765" ' : '';

// Welcome
task_message('Running .env file and connection checks...', 'WP-CLI Sync', 97);
Expand All @@ -80,11 +77,22 @@ function lb_cr() {
* BEGIN VAR / CONNECTION CHECKS
*/

// Exit if some vars missing
if (empty($ssh_hostname) || empty($ssh_username) || empty($rem_proj_loc)) {
$message = 'Missing vars in .env: ';
$missing = [];
foreach([
'REMOTE_SSH_HOSTNAME' => $ssh_hostname,
'REMOTE_SSH_USERNAME' => $ssh_username,
'REMOTE_PROJECT_DIR' => $rem_proj_loc,
] as $env_name => $env_value) {
if (empty($env_value)) {
$missing[] = $env_name;
}
}
$message .= implode(', ', $missing);

// Exit Messages
task_message('some/all local sync vars are not set in .env file', 'Error', 31, false);
task_message($message, 'Error', 31, false);

// Line Break + Color Reset + Exit
lb_cr();
Expand All @@ -93,7 +101,7 @@ function lb_cr() {
}

// Check if Remote location formatted correctly
if(($rem_proj_loc[0] != '/') && ($rem_proj_loc[0] != '~')) {
if(!preg_match('/^~?\//', $rem_proj_loc)) {

// Exit Messages
task_message('Incorrect formatting of the REMOTE_PROJECT_DIR variable', 'Error', 31, false);
Expand All @@ -103,22 +111,12 @@ function lb_cr() {
lb_cr();
exit();

} elseif($rem_proj_loc[0] == '~') {

if($rem_proj_loc[1] != '/') {

// Exit Messages
task_message('Incorrect formatting of the REMOTE_PROJECT_DIR variable', 'Error', 31, false);
task_message('Ensure that the path begins with either / or ~/', 'Hint', 33);

// Line Break + Color Reset + Exit
lb_cr();
exit();

}

}

$ssh_port = $_ENV['REMOTE_PORT'] ?? false;
$ssh_port_command = $ssh_port ? ' -p ' . $ssh_port . ' ' : '';
$rsync_port_command = $ssh_port ? ' -e "ssh -p 18765" ' : '';

// Check if SSH connection works
$command = 'ssh ' . $ssh_port_command . ' -q '.$ssh_username.'@'.$ssh_hostname.' exit; echo $?';
$remote_server_status = exec($command);
Expand Down