From: Niki Roo Date: Wed, 3 Jul 2024 13:21:33 +0000 (+0200) Subject: Auto commit 2024-07-03 15:21 X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=0b75a0c6579b7a932ffb3c1f50cd20e6a9dcffab;p=notes.git Auto commit 2024-07-03 15:21 --- diff --git a/Phone/Framagenda/index.html b/Phone/Framagenda/index.html index 6cd0a6e..1f167a0 100644 --- a/Phone/Framagenda/index.html +++ b/Phone/Framagenda/index.html @@ -453,7 +453,7 @@ - + diff --git a/git/index.html b/git/index.html index da9929b..3e01f67 100644 --- a/git/index.html +++ b/git/index.html @@ -451,13 +451,15 @@

Git

Set upstream: -* git push --set-upstream remote_name local_branch -* git pull --set-upstream remote_name local_branch

-

Delete branch: -* git branch -d xxx -* git branch -D xxx (force delete) -* git push MY_REMOTE --delete XXX -* git push MY_REMOTE :XXX (identical to above)

+- git push --set-upstream remote_name local_branch +- git pull --set-upstream remote_name local_branch

+

Delete branch:

+

Move branch * git checkout OLD_NAME * git branch -m NEW_NAME

diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml new file mode 100644 index 0000000..aefe3d7 --- /dev/null +++ b/mkdocs/mkdocs.yml @@ -0,0 +1,11 @@ +site_name: Niki's Doc +theme: + name: material + features: + - content.action.edit +plugins: + - privacy +# - offline +#repo_url: https://github.com/nikiroo/fanfix +# repo_name: squidfunk/mkdocs-material +#edit_uri: edit/master/docs/ diff --git a/mkdocs/update.sh b/mkdocs/update.sh new file mode 100644 index 0000000..a179585 --- /dev/null +++ b/mkdocs/update.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +DDIR=/home/user/Notes + +if [ "$1" = "" ]; then + # Host + cd "`dirname "$0"`" + if [ $? != 0 ]; then + echo Cannot find directory \ + | tee mkdocs/error.txt >&2 + exit 42 + fi + cd .. + rm -f mkdocs/ok mkdocs/error.txt + touch mkdocs/wip + OPTS="-v $PWD:$DDIR:rw" /opt/docker/launch.sh \ + --start $DDIR/mkdocs/update.sh mkdocs \ + build + echo + echo Leaving docker machine... + echo + [ -e mkdocs/ok ] ; rep=$? ; rm -f mkdocs/ok + if [ $rep = 0 ]; then + echo Copying to remote site... + cd mkdocs/site + git add . + if [ $? != 0 ]; then + echo Failure to add newly built html site \ + | tee mkdocs/error.txt >&2 + exit 20 + fi + git commit -m "`date +"Auto commit %Y-%m-%d %H:%M"`" + if [ $? != 0 ]; then + echo Failure to commit to git \ + | tee mkdocs/error.txt >&2 + exit 21 + fi + git push nikiroo html + if [ $? != 0 ]; then + echo Failure to push html branch to nikiroo \ + | tee mkdocs/error.txt >&2 + exit 22 + fi + else + echo Failed to update, no remote copy started: $rep \ + | tee mkdocs/error.txt >&2 + fi + rm -f mkdocs/wip + exit $rep +fi + +# Docker +echo +echo Entering docker machine... +echo + +cd +cp "$DDIR/mkdocs/mkdocs.yml" "$HOME/" || exit +ln -s "$DDIR" docs || exit +mkdocs build -d "$DDIR"/mkdocs/site || exit +touch "$DDIR/mkdocs/ok" + diff --git a/mkdocs/wip b/mkdocs/wip new file mode 100644 index 0000000..e69de29 diff --git a/mp4/index.html b/mp4/index.html index e5d110d..b2e9c44 100644 --- a/mp4/index.html +++ b/mp4/index.html @@ -998,7 +998,7 @@ All the flags not part of an input files (after the last -i) target - + diff --git a/scaling/index.html b/scaling/index.html index 0d6c14b..7178f28 100644 --- a/scaling/index.html +++ b/scaling/index.html @@ -705,7 +705,7 @@ xrandr --fb 1574x884 --output eDP1 --mode 1366x768 --panning 1574x886 --scale 1. - + diff --git a/sitemap.xml.gz b/sitemap.xml.gz index 6234537..a8b7781 100644 Binary files a/sitemap.xml.gz and b/sitemap.xml.gz differ diff --git a/web-css/index.html b/web-css/index.html index f4f2ecf..56ce40d 100644 --- a/web-css/index.html +++ b/web-css/index.html @@ -566,7 +566,7 @@ h1 :has(h2) { margin: 0 0 0.25rem 0; } /* less margin if a H2 follows it */ - +