Merge branch 'development' of github.com:Ortus-Solutions/contentbox-c…

…li into development
Ortus-Solutions · Dec 14, 2023 · d55d37e · d55d37e
2 parents 9e7cdd0 + f532435
commit d55d37e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/build/Build.cfc b/build/Build.cfc
@@ -38,7 +38,7 @@ component {
 		} );
 
 		// Create Project Dependency Mappings
-		//fileSystemUtil.createMapping( "@module_name@", variables.cwd );
+		// fileSystemUtil.createMapping( "@module_name@", variables.cwd );
 
 		return this;
 	}
@@ -299,9 +299,9 @@ component {
 	 */
 	private function ensureExportDir(
 		required projectName,
-		version   = "1.0.0"
+		version = "1.0.0"
 	){
-		if ( structKeyExists( variables, "exportsDir" ) && directoryExists( variables.exportsDir ) ){
+		if ( structKeyExists( variables, "exportsDir" ) && directoryExists( variables.exportsDir ) ) {
 			return;
 		}
 		// Prepare exports directory

diff --git a/commands/contentbox/install.cfc b/commands/contentbox/install.cfc
@@ -110,8 +110,10 @@ component {
 
 		// ContentBox 5 ONLY, as it uses ORM DDL, 6 uses migrations
 		// MySQL 8 Bug on Lucee
-		if ( arguments.contentboxVersion eq 5 && arguments.cfmlEngine.findNoCase( "lucee" ) && arguments.databaseType == "MySQL8" ) {
-			contentBox5LuceeBug( installDir);
+		if (
+			arguments.contentboxVersion eq 5 && arguments.cfmlEngine.findNoCase( "lucee" ) && arguments.databaseType == "MySQL8"
+		) {
+			contentBox5LuceeBug( installDir );
 		}
 
 		// Seed the right CFML Engine to deploy
@@ -168,17 +170,17 @@ component {
 
 	private function startupServer( required cfmlEngine ){
 		variables.print
-				.line()
-				.blueLine( "Please wait while we startup your CommandBox server..." )
-				.toConsole();
-			command( "server start" ).run();
-			sleep( 5000 );
+			.line()
+			.blueLine( "Please wait while we startup your CommandBox server..." )
+			.toConsole();
+		command( "server start" ).run();
+		sleep( 5000 );
 
-			variables.print.greenLine( "√ ContentBox server started, check out the details below:" );
-			command( "server info" ).run();
+		variables.print.greenLine( "√ ContentBox server started, check out the details below:" );
+		command( "server info" ).run();
 
-			variables.print.greenLine( "√ Opening a browser for you to continue with the web installer..." );
-			command( "server open" ).run();
+		variables.print.greenLine( "√ Opening a browser for you to continue with the web installer..." );
+		command( "server open" ).run();
 	}
 
 	/**