This commit is contained in:
coulisse 2022-01-22 08:21:05 +00:00
parent 514f7b0cef
commit 9b3c79f5a4
12 changed files with 32 additions and 34 deletions

View File

@ -2,7 +2,6 @@
Date: 22/01/2022
Release: v2.3
- lint on code with sonarqube
___
Date: 13/01/2022
Release: v2.2

View File

@ -22,8 +22,9 @@ changelog=${path_docs}'/'CHANGELOG.md
#fi
echo 'get version from git'
ver=`git describe --tags --abbrev=0`
if [ "$?" != "0" ]; then
#ver=`git describe --tags --abbrev=0`
if ! ver=$(git describe --tags --abbrev=0)
then
echo 'ERROR on get version from git'
exit 10
fi
@ -34,8 +35,8 @@ fi
echo 'version: '${ver}
echo 'writing version in '${manifest} '...'
sed -i 's/v.*",/'$ver'",/g' ${manifest}
if [ "$?" != "0" ]; then
if ! sed -i 's/v.*",/'$ver'",/g' ${manifest}
then
echo 'ERROR writing version in '${manifest}
exit 42
fi
@ -48,53 +49,52 @@ if [ "$?" != "0" ]; then
fi
echo 'writing version in '${changelog} '...'
sed -i '1,4s/Release: v.*/Release: '$ver'/g' ${changelog}
if [ "$?" != "0" ]; then
if ! sed -i '1,4s/Release: v.*/Release: '$ver'/g' ${changelog}
then
echo 'ERROR writing version in '${changelog}
exit 35
fi
echo 'writing date in '${changelog} '...'
sed -i '1,4s/Date: [0-9][0-9]\/[0-9][0-9]\/[0-9][0-9][0-9][0-9]/Date: '`date '+%d\/%m\/%Y'`'/g' ${changelog}
if [ "$?" != "0" ]; then
#sed -i '1,4s/Date: [0-9][0-9]\/[0-9][0-9]\/[0-9][0-9][0-9][0-9]/Date: '`date '+%d\/%m\/%Y'`'/g' ${changelog}
if ! sed -i '1,4s/Date: [0-9][0-9]\/[0-9][0-9]\/[0-9][0-9][0-9][0-9]/Date: '$(date '+%d\/%m\/%Y')'/g' ${changelog}
then
echo 'ERROR writing date in '${changelog}
exit 35
fi
echo 'writing version in '${base_template} '...'
sed -i 's/<span id="version">v.*<\/span>/<span id="version">'$ver'<\/span>/g' ${path_templates}/${base_template}
if [ "$?" != "0" ]; then
if ! sed -i 's/<span id="version">v.*<\/span>/<span id="version">'$ver'<\/span>/g' ${path_templates}/${base_template}
then
echo 'ERROR writing version in '${base_template}
exit 40
fi
echo 'generating static pages...'
#staticjinja build --srcpath=${path_static_html}/templates/ --outpath=${path_static_html}/ --log=info
python ../lib/static_build.py
if [ "$?" != "0" ]; then
if ! python ../lib/static_build.py
then
echo 'ERROR generating static pages'
exit 50
fi
echo 'writing requirements...'
pip freeze|tee ../requirements.txt
if [ "$?" != "0" ]; then
if ! pip freeze|tee ../requirements.txt
then
echo 'ERROR wrinting requirements'
exit 60
fi
#used to minify the application javascript
echo 'minify javascripts...'
#for i in `ls -1 ${path_static_js}/ -I "*.min.*" -I "*.md"`
shopt -s extglob
for i in ${path_static_js}/!(*[m][i][n].js|*.md)
do
[[ -e ${i} ]] || break # handle the case of no files found
echo ${i}
file_no_ext=`basename "${i%.js}"`
#curl -X POST --data-urlencode 'input@'${path_static_js}/${i} https://javascript-minifier.com/raw > ${path_static_js}/${file_no_ext}.min.js
curl -X POST -s --data-urlencode 'input@'${path_static_js}/${i} https://www.toptal.com/developers/javascript-minifier/raw > ${path_static_js}/${file_no_ext}.min.js
if [ "$?" != "0" ]; then
file_no_ext=$(basename "${i%.js}")
if ! curl -X POST -s --data-urlencode 'input@'${path_static_js}/${i} https://www.toptal.com/developers/javascript-minifier/raw > ${path_static_js}/${file_no_ext}.min.js
then
echo 'ERROR minifying javascript: '${i}
shopt -u extglob
exit 80
@ -104,15 +104,14 @@ done
#used to minify css
echo 'minify css...'
#for i in `ls -1 ${path_static_css}/ -I "*.min.*" -I "*.md"`
for i in ${path_static_css}/!(*[m][i][n].css|*.md)
do
[[ -e ${i} ]] || break # handle the case of no files found
echo ${i}
file_no_ext=`basename "${i%.css}"`
file_no_ext=$(basename "${i%.css}")
#curl -X POST --data-urlencode 'input@'${path_static_css}/${i} https://cssminifier.com/raw > ${path_static_css}/${file_no_ext}.min.css
curl -X POST --data-urlencode 'input@'${i} https://cssminifier.com/raw > ${path_static_css}/${file_no_ext}.min.css
if [ "$?" != "0" ]; then
if ! curl -X POST --data-urlencode 'input@'${i} https://cssminifier.com/raw > ${path_static_css}/${file_no_ext}.min.css
then
echo 'ERROR minifying css: '${i}
shopt -u extglob
exit 80

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d1746f6896dfa9c","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c0f691200ac","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d17470a68c6423c","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c23386a4184","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d17471e2e8800fc","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c36ef555959","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d1747320dd40bed","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c4b3d5e419c","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d174745ce1f425a","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c5f1f2bfaa0","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d1747598e710bb5","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c72ff974bdd","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d17476d48c24c3d","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c86cd941eb1","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d174781596100f0","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175c9a9ae0414e","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d1747952e910c6d","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175cae4c0b4c08","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>

View File

@ -6,6 +6,6 @@
</head>
<body>
<pre>Internal Server Error</pre>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d1747a8f991009b","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
<script defer src="https://static.cloudflareinsights.com/beacon.min.js/v652eace1692a40cfa3763df669d7439c1639079717194" integrity="sha512-Gi7xpJR8tSkrpF7aordPZQlW2DLtzUlZcumS8dMQjwDHEnw9I7ZLyiOj/6tZStRBGtGgN6ceN6cMH8z7etPGlw==" data-cf-beacon='{"rayId":"6d175cc2197efa18","token":"7da7549002684d63b0f6277c72d857c2","version":"2021.12.0","si":100}' crossorigin="anonymous"></script>
</body>
</html>