Fixing straggler dev/ issues

stellarwp · May 25, 2020 · 0fa87a7 · 0fa87a7
1 parent 4001638
commit 0fa87a7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/commands/using.php b/src/commands/using.php
@@ -24,7 +24,7 @@
 
 echo light_cyan( "Using {$using}\n" );
 
-if ( tric_plugins_dir() !== root( 'plugins' ) ) {
+if ( tric_plugins_dir() !== root( '_plugins' ) ) {
 	echo light_cyan( "\nFull target path: " ) . $target_path;
 }
 

diff --git a/src/tric.php b/src/tric.php
@@ -133,7 +133,7 @@ function tric_target( $require = true ) {
  * @param string $target Target to switch to.
  */
 function tric_switch_target( $target ) {
-	$root              = dirname( dirname( __DIR__ ) );
+	$root              = root();
 	$run_settings_file = "{$root}/.env.tric.run";
 
 	write_env_file( $run_settings_file, [ 'TRIC_CURRENT_PROJECT' => $target ], true );
@@ -366,7 +366,7 @@ function tric_info() {
 	];
 
 	echo colorize( "<yellow>Configuration read from the following files:</yellow>\n" );
-	$tric_root = dirname( dirname( __DIR__ ) );
+	$tric_root = root();
 	echo implode( "\n", array_filter( [
 			file_exists( $tric_root . '/.env.tric' ) ? "  - " . $tric_root . '/.env.tric' : null,
 			file_exists( $tric_root . '/.env.tric.local' ) ? "  - " . $tric_root . '/.env.tric.local' : null,

diff --git a/src/utils.php b/src/utils.php
@@ -503,16 +503,3 @@ function ask( $question, $default = null ) {
 
 	return '' === $value ? $default : $value;
 }
-
-/**
- * Returns the absolute path to the root directory.
- *
- * @param string $path An optional, relative path to append to the root directory absolute path.
- *
- * @return string The absolute path to the root directory.
- */
-function root_dir( $path = '' ) {
-	$root = dirname( dirname( __DIR__ ) );
-
-	return empty( $path ) ? $root : $root . '/' . ltrim( $path, '\\/' );
-}