From 7092b41f789f446bda749b4d0fbf7c570c47c8fe Mon Sep 17 00:00:00 2001 From: 20kdc Date: Wed, 23 May 2018 23:35:05 +0100 Subject: [PATCH] Work out how future development is going to work --- .gitignore | 3 +++ README.md | 5 +++++ package-gold.sh | 11 +++++++++++ 3 files changed, 19 insertions(+) create mode 100755 package-gold.sh diff --git a/.gitignore b/.gitignore index 8eec4c7..1e32f66 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,10 @@ repobuild/*/*/ repobuild/*/*/* inst.lua +# Available as the respective release +inst-gold.lua com2/code.tar.bd upldr.sh upldr-dev.sh +upldr-gold.sh repository/inst.lua diff --git a/README.md b/README.md index a1bbe51..e1f83bf 100644 --- a/README.md +++ b/README.md @@ -136,3 +136,8 @@ Secondly, for a compressed installer, you use `package.sh`. That rebuilds `code.tar` and `inst.lua`, and also prepares the final structure of the repository to upload. +NOTE! Future OS changes after r2 will be kept in a "future" branch. + +The "future" branch gets rebased onto master and then recreated. + +So expect that. diff --git a/package-gold.sh b/package-gold.sh new file mode 100755 index 0000000..aedf596 --- /dev/null +++ b/package-gold.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# This is released into the public domain. +# No warranty is provided, implied or otherwise. + +stat repobuild/data/app-claw/local.lua && rm -rf repobuild +mkdir repobuild +cp -r code/* repobuild/ +cp -r repository/* repobuild/ +cp inst-gold.lua repobuild/inst.lua +lua clawmerge.lua repository/data/app-claw/local.lua code/data/app-claw/local.lua > repobuild/data/app-claw/local.lua