Show progress counter when applying patches

edg2s · MatmaRex · commit 117dfe8fb982 · 2021-12-07T15:21:47.000+01:00
diff --git a/new.php b/new.php
@@ -422,13 +422,18 @@ static function ( string $repo ) use ( $repos ): bool {
 	abandon( "Could not install wiki" );
 }
 
-set_progress( 80, 'Fetching and applying patches...' );
-
+$start = 80;
+$end = 90;
+$progress = $start;
+$count = count( $commands );
 foreach ( $commands as $i => $command ) {
+	$n = $i + 1;
+	set_progress( $progress, "Fetching and applying patches ($n/$count)..." );
 	$error = shell_echo( $command[1], $baseEnv + $command[0] );
 	if ( $error ) {
 		abandon( "Could not apply patch {$patchesApplied[$i]}" );
 	}
+	$progress += ( $end - $start ) / $count;
 }
 
 set_progress( 90, 'Setting up wiki content...' );

Original file line number	Diff line number	Diff line change
`@@ -422,13 +422,18 @@ static function ( string $repo ) use ( $repos ): bool {`
`422`	`422`	`abandon( "Could not install wiki" );`
`423`	`423`	`}`
`424`	`424`
`425`		`-set_progress( 80, 'Fetching and applying patches...' );`
`426`		`-`
	`425`	`+$start = 80;`
	`426`	`+$end = 90;`
	`427`	`+$progress = $start;`
	`428`	`+$count = count( $commands );`
`427`	`429`	`foreach ( $commands as $i => $command ) {`
	`430`	`+ $n = $i + 1;`
	`431`	`+ set_progress( $progress, "Fetching and applying patches ($n/$count)..." );`
`428`	`432`	`$error = shell_echo( $command[1], $baseEnv + $command[0] );`
`429`	`433`	`if ( $error ) {`
`430`	`434`	`abandon( "Could not apply patch {$patchesApplied[$i]}" );`
`431`	`435`	`}`
	`436`	`+ $progress += ( $end - $start ) / $count;`
`432`	`437`	`}`
`433`	`438`
`434`	`439`	`set_progress( 90, 'Setting up wiki content...' );`