meso-web

commit a172dcf851a395ea74ca41b6d41738c0e705a45a
parent 1478b5e2753bdbe25e9d062c2614ddccd1bfc60c
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue, 21 Feb 2023 22:08:02 +0100

htrdr: make the planeto Starter-Pack private

Diffstat:
M
htrdr/Makefile
 | 
34
++++++++++++++++++++++++----------
M
htrdr/htrdr_build.sh
 | 
8
++++----
M
meso-menu.sh
 | 
10
+++++-----

3 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/htrdr/Makefile b/htrdr/Makefile
@@ -50,9 +50,16 @@ PLANETOSPK_VERSION=0.0.0
 PLANETOSPK_DIR=htrdr-Planeto-Starter-Pack-$(PLANETOSPK_VERSION)
 PLANETOSPK_ARCH=downloads/$(PLANETOSPK_DIR).tar.gz
 PLANETOSPK_README=$(PLANETOSPK_DIR)/README.md.in
-PLANETOSPK_PKG=\
- downloads/htrdr-Planeto-Starter-Pack-0.0.0.tar.gz
-PLANETOSPK_SIG=$(PLANETOSPK_PKG:=.sig)
+#PLANETOSPK_PKG=\
+# downloads/htrdr-Planeto-Starter-Pack-0.0.0.tar.gz
+#PLANETOSPK_SIG=$(PLANETOSPK_PKG:=.sig)
+
+# Make the planeto starter-pack private. The prefix is actually the sha256
+# digest of the public archive
+PLANETOSPK_PRIV_PREFIX=8eaa0eeca2a55d63e7745bbd893c73e0f2d3d0b51655080ceb643a2af2bc2323
+PLANETOSPK_PRIV_HTML=$(PLANETOSPK_PRIV_PREFIX).html
+PLANETOSPK_PRIV_ARCH=downloads/$(PLANETOSPK_PRIV_PREFIX).tar.gz
+PLANETOSPK_PRIV_SIG=$(PLANETOSPK_PRIV_ARCH:=.sig)
 
 MAN=\
  $(HTRDR_DIR)/share/man/man1/htpp.1\
@@ -120,7 +127,7 @@ HTML=\
  htrdr.html\
  htrdr-atmosphere-spk.html\
  htrdr-combustion-spk.html\
- htrdr-planeto-spk.html\
+ $(PLANETOSPK_PRIV_HTML)\
  htrdr-docs.html\
  htrdr-mods.html
 
@@ -143,6 +150,8 @@ distclean: clean
 		$(COMSPK_README)\
 		$(PLANETOSPK_SIG)\
 		$(PLANETOSPK_README)\
+		$(PLANETOSPK_PRIV_ARCH)\
+		$(PLANETOSPK_PRIV_SIG)\
 		$(HTRDR_README)\
 		$(MAN)
 
@@ -156,8 +165,8 @@ install: build
 		$(ATMSPK_SIG)\
 		$(COMSPK_PKG)\
 		$(COMSPK_SIG)\
-		$(PLANETOSPK_PKG)\
-		$(PLANETOSPK_SIG)\
+		$(PLANETOSPK_PRIV_ARCH)\
+		$(PLANETOSPK_PRIV_SIG)\
 		$(PREFIX)/htrdr/
 
 htrdr_build.sh: ../meso-menu.sh
@@ -219,13 +228,18 @@ $(COMSPK_README):
 ################################################################################
 # Planeto Starter-Pack
 ################################################################################
-htrdr-planeto-spk.html: \
+$(PLANETOSPK_PRIV_HTML):\
 		$(PLANETOSPK_IMG) \
-		$(PLANETOSPK_SIG) \
+		$(PLANETOSPK_PRIV_SIG) \
 		$(PLANETOSPK_README) \
 		htrdr_build.sh
 	@echo "Building $@"
-	@$(SHELL) htrdr_build.sh planetospk $(PLANETOSPK_README) $(PLANETOSPK_VERSION) > $@
+	@$(SHELL) htrdr_build.sh planetospk $(PLANETOSPK_README) $(PLANETOSPK_VERSION) \
+			 $(PLANETOSPK_PRIV_ARCH) > $@
+
+$(PLANETOSPK_PRIV_ARCH): $(PLANETOSPK_ARCH)
+	@echo "Make the $(PLANETOSPK_ARCH) private (copy to $(PLANETOSPK_PRIV_ARCH))"
+	@cp $(PLANETOSPK_ARCH) $(PLANETOSPK_PRIV_ARCH)
 
 $(PLANETOSPK_README):
 	@echo "Extracting data from $(PLANETOSPK_ARCH)"
@@ -255,7 +269,7 @@ lint_shells:
 .sig: Makefile  ../configure_targets.sh
 	@echo "Setup .sig"
 	@$(SHELL) ../configure_targets.sh sig \
-		$(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETOSPK_PKG) > .sig
+		$(ATMSPK_PKG) $(COMSPK_PKG) $(PLANETOSPK_PRIV_ARCH) > .sig
 
 .lint: Makefile ../configure_targets.sh
 	@echo "Setup .lint"
diff --git a/htrdr/htrdr_build.sh b/htrdr/htrdr_build.sh
@@ -318,8 +318,8 @@ comspk()
 
 planetospk()
 {
-  if [ $# -lt 2 ]; then
-    printf "Usage: %s planetospk <readme> <version>\n" "$0" >&2
+  if [ $# -lt 3 ]; then
+    printf "Usage: %s planetospk <readme> <version> <private-archive>\n" "$0" >&2
     exit 1
   fi
 
@@ -350,8 +350,8 @@ planetospk()
   echo "<div class=\"news\">"
   echo "  <p><b>Planeto Starter Pack $2</b></p>"
   echo "  <ul>"
-  echo "    <li><a href=\"downloads/htrdr-Planeto-Starter-Pack-$2.tar.gz\">tarball</a> /"
-  echo "        <a href=\"downloads/htrdr-Planeto-Starter-Pack-$2.tar.gz.sig\">pgp</a></li>"
+  echo "    <li><a href=\"$3\">tarball</a> /"
+  echo "        <a href=\"$3.sig\">pgp</a></li>"
   echo "  </ul>"
   echo "</div>"
 
diff --git a/meso-menu.sh b/meso-menu.sh
@@ -136,11 +136,11 @@ print_htrdr_sub_menu() {
   else
     echo "        <li><a href=\"${root}htrdr/htrdr-combustion-spk.html\">Combustion</a></li>"
   fi
-  if [ "${name}" = "Planeto-Starter-Pack" ]; then
-    echo "        <li id=\"cur\">Planeto</li>"
-  else
-    echo "        <li><a href=\"${root}htrdr/htrdr-planeto-spk.html\">Planeto</a></li>"
-  fi
+#  if [ "${name}" = "Planeto-Starter-Pack" ]; then
+#    echo "        <li id=\"cur\">Planeto</li>"
+#  else
+#    echo "        <li><a href=\"${root}htrdr/htrdr-planeto-spk.html\">Planeto</a></li>"
+#  fi
   echo "      </ul></li>"
   if [ "${name}" = "Mods" ]; then
     echo "      <li id=\"cur\">Modifications</li>"