fix wrong merge

add ignore file
add date
2024-07-09 17:52:45 +02:00 · 2024-07-07 20:57:02 +02:00 · 2024-07-07 20:51:41 +02:00 · 2024-07-07 20:46:12 +02:00 · 2024-07-07 20:36:26 +02:00 · 2024-07-07 19:47:55 +02:00
3 changed files with 10 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+update.log
+*.update
--- a/N2799yju69FNnwS7iD35.html
+++ b/N2799yju69FNnwS7iD35.html
@@ -1 +0,0 @@
-hello toto
--- a/update_site.sh
+++ b/update_site.sh
@@ -0,0 +1,8 @@
+#!/bin/ash
+cd /websites/piquemouche
+date >> update.log
+git fetch >> update.log
+git restore . >> update.log
+git merge origin/master >> update.log
+sed -i 's#class="align-left">www.piquemouche.fr<br>#><a href="https://piquemouche.fr">piquemouche.fr</a>#g' *.html >> update.log
+echo '.footer__copyright ul{margin-left:2rem}.footer__copyright{text-transform:none!important;display:flex;flex-direction:row;justify-content:space-around}.footer__copyright>p{display:none}.footer__copyright ul>li{list-style:none}.footer__copyright ul>li:first-child{font-size:1.5em;font-weight:700}.footer__copyright{margin-left:10%;margin-right:10%}body{background: #FFF8D6;}' >> assets/css/style.css
Author	SHA1	Message	Date
oiseauroch	76800f5a88	fix wrong merge Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m13s	2024-07-09 17:52:45 +02:00
oiseauroch	f5d0b72e18	add ignore file Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m9s	2024-07-07 20:57:02 +02:00
oiseauroch	75d19d8f49	add date Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m1s	2024-07-07 20:51:41 +02:00
oiseauroch	debbaa23fb	add shebang for alpine Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m10s	2024-07-07 20:46:12 +02:00
oiseauroch	7d6902a21c	add cd Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m8s	2024-07-07 20:36:26 +02:00
oiseauroch	eea6d617e8	add script to update Some checks failed Gitea Actions Demo / Explore-Gitea-Actions (push) Failing after 1m12s	2024-07-07 19:47:55 +02:00