From be2354c9b81478b46102c298f914c354f7e31693 Mon Sep 17 00:00:00 2001
From: mappu <mappu04@gmail.com>
Date: Sun, 3 May 2020 16:17:36 +1200
Subject: [PATCH] separate main rebuilder from bootstrap environment

---
 build-worker      | 27 +++++++++++++++++++++++++++
 lib/bootstrap.php | 34 ++++++++++++----------------------
 rebuild.sh        |  2 +-
 3 files changed, 40 insertions(+), 23 deletions(-)
 create mode 100755 build-worker

diff --git a/build-worker b/build-worker
new file mode 100755
index 0000000..451af65
--- /dev/null
+++ b/build-worker
@@ -0,0 +1,27 @@
+#!/usr/bin/php
+<?php
+
+require __DIR__ . '/lib/bootstrap.php';
+
+function main($args) {
+	$config  = setup_vars();
+	
+	$total   = $args[0];
+	$pos     = $args[1];
+	
+	// Perform build tasks
+	
+	if ($pos == 0) {
+		buildcommon();
+		if (array_key_exists('redirect', $config)) {
+			buildredirects( $config['redirect'] );
+		}
+		if (array_key_exists('golang-subpackages', $config)) {
+			buildgosubpackages( $config['golang-subpackages'] );
+		}
+	} else {
+		buildprojects($pos, array_decimate(listprojects(), $total, $pos));
+	}
+}
+
+main(array_slice($_SERVER['argv'], 1));
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 93b2537..fae6fe1 100755
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -1,4 +1,3 @@
-#!/usr/bin/php
 <?php
 
 ini_set('display_errors', 'On');
@@ -11,13 +10,18 @@ require __DIR__.'/CProject.php';
 
 define('SHIELDS_CACHE_DIR', __DIR__.'/../shields_cache/');
 
-function main($args) {
-	$basedir = './';
-	$total   = $args[0];
-	$pos     = $args[1];
+/**
+ * Set up global defines for a given codesite project
+ * Should be called once we have the root path for a codesite project.
+ * 
+ */
+function setup_vars(string $basedir="./"): array {
 	
 	// Parse configuration
-	
+	if (! is_file($basedir.'config.ini')) {
+		die("[FATAL] Non-file '${basedir}config.ini'!\n");
+	}
+
 	$config = @parse_ini_file(
 		$basedir . 'config.ini',
 		true,
@@ -25,7 +29,7 @@ function main($args) {
 	);
 	
 	if ($config === false) {
-		die("[FATAL] Couldn't load '${basedir}/config.ini'!\n");
+		die("[FATAL] Couldn't load '${basedir}config.ini'!\n");
 	}
 	
 	define('BASEDIR',       $basedir);
@@ -39,19 +43,5 @@ function main($args) {
 	define('ARTICLE_HEADER', (isset($config['codesite']['article_header']) ? $config['codesite']['article_header'] : 'ABOUT') );	
 	define('SHIELDS_PREFIX', isset($config['codesite']['shields_prefix']));
 	
-	// Perform build tasks
-	
-	if ($pos == 0) {
-		buildcommon();
-		if (array_key_exists('redirect', $config)) {
-			buildredirects( $config['redirect'] );
-		}
-		if (array_key_exists('golang-subpackages', $config)) {
-			buildgosubpackages( $config['golang-subpackages'] );
-		}
-	} else {
-		buildprojects($pos, array_decimate(listprojects(), $total, $pos));
-	}
+	return $config;
 }
-
-main(array_slice($_SERVER['argv'], 1));
diff --git a/rebuild.sh b/rebuild.sh
index 8845d3b..ff9bb0e 100755
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -40,7 +40,7 @@ buildsite() {
 
 		local threadcount=$(numcpus)
 		for i in $(seq 0 "$threadcount") ; do
-			"${APP_DIR}/lib/bootstrap.php" "$threadcount" "$i" &
+			"${APP_DIR}/build-worker" "$threadcount" "$i" &
 		done
 		wait