meso-web

commit 416a7dff6229ec75331137ba09e48a85904c0f56
parent f90784e0a4d3060fe4ffb2d2ab851686c10a4b79
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Tue,  3 Oct 2017 19:07:13 +0200

Sign the Solstice PP archive

Diffstat:
M
Makefile
 | 
5
++---
M
meso.css
 | 
2
+-
M
solstice-resources.html.in
 | 
21
+++++++++++++--------
M
solstice.sh
 | 
40
+++++++++++++++++++++++++++++-----------

4 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/Makefile b/Makefile
@@ -40,7 +40,8 @@ clean:
 		downloads/*.sig \
 		downloads/Solstice-ABG.pdf \
 		downloads/Solstice-ABG-rsrc.zip \
-		downloads/Solstice-PP-Sources.tar.gz
+		downloads/Solstice-PP-Sources.tar.gz \
+		downloads/Solstice-PP-Sources.tar.gz.sig 
 
 .PHONY: publish
 publish:
@@ -55,7 +56,5 @@ publish:
 		downloads/*.tar.gz \
 		downloads/*.zip \
 		downloads/*.sig \
-		downloads/Solstice-ABG* \
-		downloads/Solstice-PP-Sources.tar.gz \
 		$(REMOTE)/downloads/
 	rsync -avzr man $(REMOTE)
diff --git a/meso.css b/meso.css
@@ -210,7 +210,7 @@ tr#gray {
   background-color: #ccc;
 }
 
-tr:nth-child(2n) {
+tr:nth-child(2n+1) {
     background-color: #F7F6F1;
 }
 
diff --git a/solstice-resources.html.in b/solstice-resources.html.in
@@ -38,17 +38,22 @@ href="https://www.gnu.org/licenses/gpl.html">license</a> for details.</p>
 
 <table>
   <tr><th>Sources</th></tr>
-  <tr><td>[<a href="downloads/Solstice-PP-Sources.tar.gz">tarball</a>]</td></tr>
+  <tr><td>
+    [<a href="downloads/Solstice-PP-Sources.tar.gz">tarball</a>]
+    [<a href="downloads/Solstice-PP-Sources.tar.gz.sig">pgp</a>]
+  </td></tr>
 </table>
 
-<p>To use these tools, download the provided archive that contains their
-sources and a GNU/Makefile to simplify the build process on GNU/Linux and on
-Windows through <a href="http://www.mingw.org/">MinGW</a>; then, extract it and
-run <code>make</code> to build the programs. Note that even though this archive
-targets GNU-compliant systems, the provided sources can be compiled by any C
-compiler that conforms to the C99 standard.</p>
+<p>To use these tools, download the provided archive and verify its integrity
+against its <a href=solstice-downloads.html#pgp>PGP signature</a>. This archive
+contains the  sources of the program and a GNU/Makefile to simplify the build
+process on GNU/Linux and on Windows through <a
+href="http://www.mingw.org/">MinGW</a>. Extract it and run <code>make</code> to
+build the programs. Note that even though this archive targets GNU-compliant
+systems, the provided sources can be compiled by any C compiler that supports
+the C99 standard.</p>
 
-<pre>
+<pre class="code">
 $ wget www.meso-star.com/solstice/downloads/Solstice-PP-Sources.tar.gz
 $ tar xzvf Solstice-PP-Sources.tar.gz
 $ make -C Solstice-PP-Sources
diff --git a/solstice.sh b/solstice.sh
@@ -59,9 +59,9 @@ set -e
 # Generate the Solstice-ABG
 ################################################################################
 tput bold; echo ">>> Solstice Absolute Beginner's Guide"; tput sgr0
-if [ -f downloads/Solstice-ABG.pdf ]; then
-  echo "Nothing to do"
-else
+do_something=0
+if [ ! -f downloads/Solstice-ABG.pdf ]; then
+  do_something=1
   ABG=guide0.6
   echo "Generate the Solstice Absolute Beginner's Guide"
   cd $2
@@ -76,21 +76,28 @@ else
 fi
 
 if [ ! -f downloads/Solstice-ABG-rsrc.zip ]; then
-  echo "Archve the resources of the Solstice Absolute Beginner's Guide"
+  do_something=1
+  echo "Archive the resources of the Solstice Absolute Beginner's Guide"
   zip -r downloads/Solstice-ABG-rsrc.zip $2/source_files/*
 fi
+
+if [ $do_something == 0 ]; then
+  echo "Nothing to do"
+fi
+
 echo ""
 
 ################################################################################
 # Generate the Solstice-PP archive
 ################################################################################
 tput bold; echo ">>> Solstice Post-Processes"; tput sgr0
-if [ -f downloads/Solstice-PP-Sources.tar.gz ]; then
-  echo "Nothing to do"
-else
+do_something=0
+PP=Solstice-PP-Sources
+if [ ! -f downloads/$PP.tar.gz ]; then
+  do_something=1
   cd $dir_temp
-  mkdir Solstice-PP-Sources
-  cd Solstice-PP-Sources
+  mkdir $PP
+  cd $PP
   cp $3/sol*.c $3/solpp.h .
 
   echo "Generate the Solstice PP Makefile"
@@ -109,10 +116,21 @@ else
   } > Makefile
   cd ..
   echo "Archive the Solstice-PP sources"
-  tar czf Solstice-PP-Sources.tar.gz Solstice-PP-Sources
-  cp Solstice-PP-Sources.tar.gz $dir_curr/downloads/
+  tar czf $PP.tar.gz $PP
+  cp $PP.tar.gz $dir_curr/downloads/
   cd $dir_curr
 fi
+
+if [ ! -f downloads/$PP.tar.gz.sig ]; then
+  do_something=1
+  echo "Sign $PP.tar.gz"
+  gpg -a -o downloads/$PP.tar.gz.sig --detach-sign downloads/$PP.tar.gz
+fi
+
+if [ $do_something == 0 ]; then
+  echo "Nothing to do"
+fi
+
 echo ""
 
 ################################################################################