diff --git a/Changelog.md b/Changelog.md index a26a333..de41b14 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,11 @@ # Changelog This file holds the changelog for Pepperminty Wiki. This is the master list of things that have changed (second only to the commit history!) - though the information for any particular release can also be found in the description of it's page for every release made on GitHub too. + +## v0.19.1-hotfix + - Patched [the downloader](https://starbeamrainbowlabs.com/labs/peppermint/download.php) which was throwing warnings when packing downloads + + ## v0.19 _(No changes have been made since the last beta release.)_ diff --git a/lantern-build-engine b/lantern-build-engine index 7365f7d..5cf2cfe 160000 --- a/lantern-build-engine +++ b/lantern-build-engine @@ -1 +1 @@ -Subproject commit 7365f7d156a049d6f13987bbe55ff917e2a05254 +Subproject commit 5cf2cfebf0ee66db9167eadaa8e1956bba58a730 diff --git a/pack.php b/pack.php index 6790179..5d7b55b 100644 --- a/pack.php +++ b/pack.php @@ -1,5 +1,19 @@ extra_data_directory = "._extra_data"; + +if(isset($_GET["determine-latest-version"])) { + header("content-type: application/json"); + exit(json_encode([ + "latest_version" => trim(file_get_contents("https://raw.githubusercontent.com/sbrl/Pepperminty-Wiki/master/version")), + "local_version" => trim(file_get_contents("version")) + ])); +} + +>>>>>>> 24d15b1... Hotfix: Patch download packer, which was inadvertently broken /** * Logs a string to stdout, but only on the CLI. * @param string $line The line to log. @@ -13,12 +27,23 @@ function log_str(string $line) { log_str("*** Beginning main build sequence ***\n"); log_str("Reading in module index...\n"); +if(isset($_GET["modules"])) + $requested_modules = explode(",", $_GET["modules"]); + $module_index = json_decode(file_get_contents("module_index.json")); $module_list = []; -foreach($module_index as $module) -{ - // If the module is optional, the module's id isn't present in the command line arguments, and the special 'all' module id wasn't passed in, skip it - if($module->optional && +foreach($module_index as $module) { + /* + * If: + * - The module is optional + * - ...AND we're on the command line + * - ...AND the module isn't specified in the CLI arguments + * - ...AND the special keyword "all" isn't specified in the CLI arguments + * ....then skip it. + */ + if( + php_sapi_name() == "cli" && + $module->optional && ( isset($argv) && strrpos(implode(" ", $argv), $module->id) === false && @@ -26,12 +51,19 @@ foreach($module_index as $module) ) ) continue; + + /* + * If: + * - We're NOT on the command line + * - ...AND the module isn't requested + * ...then skip it. + */ + if(php_sapi_name() != "cli" && !in_array($module->id, $requested_modules)) + continue; + $module_list[] = $module; } -if(isset($_GET["modules"])) - $module_list = explode(",", $_GET["modules"]); - if(php_sapi_name() != "cli") { header("content-type: text/php"); header("content-disposition: attachment; filename=\"index.php\""); diff --git a/themes/blue/preview_large.png b/themes/blue/preview_large.png new file mode 100644 index 0000000..fa90d29 Binary files /dev/null and b/themes/blue/preview_large.png differ diff --git a/themes/blue/preview_small.png b/themes/blue/preview_small.png new file mode 100644 index 0000000..bc7a290 Binary files /dev/null and b/themes/blue/preview_small.png differ diff --git a/themes/default/preview_large.png b/themes/default/preview_large.png new file mode 100644 index 0000000..158eba0 Binary files /dev/null and b/themes/default/preview_large.png differ diff --git a/themes/default/preview_small.png b/themes/default/preview_small.png new file mode 100644 index 0000000..bc09b21 Binary files /dev/null and b/themes/default/preview_small.png differ diff --git a/themes/none/preview_large.png b/themes/none/preview_large.png new file mode 100644 index 0000000..236d919 Binary files /dev/null and b/themes/none/preview_large.png differ diff --git a/themes/none/preview_small.png b/themes/none/preview_small.png new file mode 100644 index 0000000..3d73c5d Binary files /dev/null and b/themes/none/preview_small.png differ diff --git a/themes/themeindex.json b/themes/themeindex.json new file mode 100644 index 0000000..4e5c5b1 --- /dev/null +++ b/themes/themeindex.json @@ -0,0 +1,29 @@ +[ + { + "hash": "095d0ec43392e33173968346d0d4f71e7317eb2e053a6b760ade937a5cf02837", + "id": "none", + "name": "No theme", + "description": "A special theme with no CSS. Useful if you want to create your own complete new theme!", + "author": "Starbeamrainbowlabs", + "author_link": "https://starbeamrainbowlabs.com/", + "minversion": "0.20" + }, + { + "hash": "0051557af4e42dec41df0f8c28ac3925bbbb291f7ab0ed1025a0644ab1bfcf3e", + "id": "default", + "name": "Default", + "description": "The default theme.", + "author": "Starbeamrainbowlabs", + "author_link": "https://starbeamrainbowlabs.com/", + "minversion": "0.20" + }, + { + "hash": "477e94cba918c41d63bf1a894046c783797201603bf46bce0cb447414af79d4b", + "id": "blue", + "name": "Blue", + "description": "A more blue theme.", + "author": "ZestyclosePainting", + "author_link": "https://reddit.com/u/ZestyclosePainting", + "minversion": "0.20" + } +]