Use $env argument of Process::fromShellCommandline

Author: edg2s

includes.php

@@ -276,20 +276,16 @@ function format_linked_tasks( array $linkedTasks ): string {
 	return $linkedTasks ?: '<em>No tasks</em>';
 }
 
-function make_shell_command( array $env, string $cmd ): string {
+function shell_echo( string $cmd, array $env = [] ): int {
+	echo '<pre>';
+
 	$prefix = '';
 	foreach ( $env as $key => $value ) {
 		$value = escapeshellarg( $value );
 		$prefix .= "$key=$value ";
 	}
-
-	return "$prefix$cmd 2>&1";
-}
-
-function shell_echo( string $cmd ): int {
-	echo '<pre>';
-	echo htmlspecialchars( "$cmd\n" );
-	$process = Process::fromShellCommandline( $cmd, null, [] );
+	echo htmlspecialchars( "$prefix$cmd\n" );
+	$process = Process::fromShellCommandline( $cmd, null, $env );
 	$process->setTimeout( null );
 	$error = $process->run( static function ( $type, $buffer ) {
 		echo htmlspecialchars( $buffer );
@@ -298,8 +294,8 @@ function shell_echo( string $cmd ): int {
 	return $error;
 }
 
-function shell( $cmd ): ?string {
-	$process = Process::fromShellCommandline( $cmd, null, [] );
+function shell( $cmd, array $env = [] ): ?string {
+	$process = Process::fromShellCommandline( $cmd, null, $env );
 	$process->setTimeout( null );
 	$error = $process->run();
 	return $error ? null : $process->getOutput();
@@ -314,11 +310,12 @@ function delete_wiki( string $wiki ): int {
 		return 'Wiki already deleted.';
 	}
 
-	$cmd = make_shell_command( [
-		'PATCHDEMO' => __DIR__,
-		'WIKI' => $wiki
-	], __DIR__ . '/deletewiki.sh' );
-	$error = shell_echo( $cmd );
+	$error = shell_echo( __DIR__ . '/deletewiki.sh',
+		[
+			'PATCHDEMO' => __DIR__,
+			'WIKI' => $wiki
+		]
+	);
 
 	foreach ( $wikiData['announcedTasks'] as $task ) {
 		// TODO: Deduplicate server/serverPath with variables in new.php

new.php

@@ -324,11 +324,11 @@ function set_progress( float $pc, string $label ) {
 $repoProgress = $start;
 
 foreach ( $repos as $source => $target ) {
-	$cmd = make_shell_command( $baseEnv + [
-		'REPOSITORIES' => "$source $target",
-	], __DIR__ . '/new/updaterepos.sh' );
-
-	$error = shell_echo( $cmd );
+	$error = shell_echo( __DIR__ . '/new/updaterepos.sh',
+		$baseEnv + [
+			'REPOSITORIES' => "$source $target",
+		]
+	);
 	if ( $error ) {
 		abandon( "Could not update repository <em>$source</em>" );
 	}
@@ -343,50 +343,49 @@ function set_progress( float $pc, string $label ) {
 	return "$k $v";
 }, array_keys( $repos ), array_values( $repos ) ) );
 
-$cmd = make_shell_command( $baseEnv + [
-	'BRANCH' => $branch,
-	'COMPOSER_HOME' => __DIR__ . '/composer',
-	'REPOSITORIES' => $reposString,
-], __DIR__ . '/new/checkout.sh' );
-
-$error = shell_echo( $cmd );
+$error = shell_echo( __DIR__ . '/new/checkout.sh',
+	$baseEnv + [
+		'BRANCH' => $branch,
+		'COMPOSER_HOME' => __DIR__ . '/composer',
+		'REPOSITORIES' => $reposString,
+	]
+);
 if ( $error ) {
 	abandon( "Could not check out wiki." );
 }
 
 set_progress( 60, 'Installing your wiki...' );
 
-$cmd = make_shell_command( $baseEnv + [
-	'WIKINAME' => $wikiName,
-	'SERVER' => $server,
-	'SERVERPATH' => $serverPath,
-	'LANGUAGE' => $language,
-], __DIR__ . '/new/install.sh' );
-
-$error = shell_echo( $cmd );
+$error = shell_echo( __DIR__ . '/new/install.sh',
+	$baseEnv + [
+		'WIKINAME' => $wikiName,
+		'SERVER' => $server,
+		'SERVERPATH' => $serverPath,
+		'LANGUAGE' => $language,
+	]
+);
 if ( $error ) {
 	abandon( "Could not install wiki." );
 }
 
 set_progress( 80, 'Fetching and applying patches...' );
 
 foreach ( $commands as $i => $command ) {
-	$cmd = make_shell_command( $baseEnv + $command[0], $command[1] );
-	$error = shell_echo( $cmd );
+	$error = shell_echo( $command[1], $baseEnv + $command[0] );
 	if ( $error ) {
 		abandon( "Could not apply patch {$patchesApplied[$i]}." );
 	}
 }
 
 set_progress( 90, 'Setting up wiki content...' );
 
-$cmd = make_shell_command( $baseEnv + [
-	'MAINPAGE' => $mainPage,
-	'USE_PROXY' => $useProxy,
-	'USE_INSTANT_COMMONS' => $useInstantCommons,
-], __DIR__ . '/new/postinstall.sh' );
-
-$error = shell_echo( $cmd );
+$error = shell_echo( __DIR__ . '/new/postinstall.sh',
+	$baseEnv + [
+		'MAINPAGE' => $mainPage,
+		'USE_PROXY' => $useProxy,
+		'USE_INSTANT_COMMONS' => $useInstantCommons,
+	]
+);
 if ( $error ) {
 	abandon( "Could not setup wiki content." );
 }