Skip to content

Commit

Permalink
Merge branch 'fix/_wordpress-directory-windows'
Browse files Browse the repository at this point in the history
  • Loading branch information
lucatume committed Jun 3, 2021
2 parents c1d51a8 + c61a748 commit ce975d1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tric

The tric (Modern **Tri**be **C**ontainers) CLI command provides a containerized and consistent environment for running automated tests.
The tric (**T**EC **R**eliable **I**solation **C**ontainers) CLI command provides a containerized and consistent environment for running automated tests.

## Installation

Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.5.27] - 2021-06-03
### Changed
- Fixed an issue where the path to the WP directory would not build correctly on Windows systems.

## [0.5.26] - 2021-03-05
### Changed
- Allow opening a shell in the `cli` service to run wp-cli commands just using `tric cli`.
Expand Down
2 changes: 1 addition & 1 deletion docs/xdebug.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Note that this command cannot be ran within `tric shell` because you've SSH'd in

Set your localhost plugin folder to map to `/var/www/html/wp-content/plugins`.

Video walk-throughs for [PhpStorm](https://drive.google.com/open?id=190vwEbkSw_aT7ZR6IvwMs50ZU2IQxLWD&authuser=luca%40tri.be&usp=drive_fs) and [VSCode](https://drive.google.com/open?id=19QeuODnskaFYDCCsB5mvfquecXBAytyM&authuser=luca%40tri.be&usp=drive_fs) (links require Modern Tribe login).
Video walk-throughs for [PhpStorm](https://drive.google.com/file/d/1sD8djXgmYWCUDCm_1XZNRx_GBbotmmiB/view?usp=sharing) and [VSCode](https://drive.google.com/file/d/1519M2SRVgWVgTm0Px6UKfBjoQgxCR7Cp/view?usp=sharing).

Screenshot from PhpStorm's video:

Expand Down
2 changes: 1 addition & 1 deletion src/tric.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ function setup_tric_env( $root_dir ) {
if ( empty( $wp_dir ) ) {
$wp_dir = root( '_wordpress' );
} elseif ( ! is_dir( $wp_dir ) ) {
$wp_dir_path = root( ltrim( $wp_dir, './' ) );
$wp_dir_path = trim(root( ltrim( $wp_dir, './' ) ));

if (
is_dir( dirname( $wp_dir_path ) )
Expand Down
4 changes: 2 additions & 2 deletions tric
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ $args = args( [
] );

$cli_name = basename( $argv[0] );
const CLI_VERSION = '0.5.26';
const CLI_VERSION = '0.5.27';

$cli_header = implode( ' - ', [
light_cyan( $cli_name ) . ' version ' . light_cyan( CLI_VERSION ),
light_cyan( 'Modern Tribe local testing and development tool' )
light_cyan( 'TEC local testing and development tool' )
] );

echo $cli_header . PHP_EOL . PHP_EOL;
Expand Down

0 comments on commit ce975d1

Please sign in to comment.