Auto commit 2024-07-03 15:21
authorNiki Roo <niki@nikiroo.be>
Wed, 3 Jul 2024 13:21:33 +0000 (15:21 +0200)
committerNiki Roo <niki@nikiroo.be>
Wed, 3 Jul 2024 13:21:33 +0000 (15:21 +0200)
Phone/Framagenda/index.html
git/index.html
mkdocs/mkdocs.yml [new file with mode: 0644]
mkdocs/update.sh [new file with mode: 0644]
mkdocs/wip [new file with mode: 0644]
mp4/index.html
scaling/index.html
sitemap.xml.gz
web-css/index.html

index 6cd0a6e261dd3f4d7f457f093ac23216518ef91b..1f167a0c3e06826f0c16e46816d4eecd478f995a 100644 (file)
     
       <script src="../../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>
index da9929b18ff86a1c8639a45ed7391acaebfaa07d..3e01f67b4efc6dcce814518fb2dfb1c900f3d922 100644 (file)
 
 <h1 id="git">Git</h1>
 <p>Set upstream:
-* <code>git push --set-upstream remote_name local_branch</code>
-* <code>git pull --set-upstream remote_name local_branch</code></p>
-<p>Delete branch:
-* <code>git branch -d xxx</code>
-* <code>git branch -D xxx</code> (force delete)
-* <code>git push MY_REMOTE --delete XXX</code>
-* <code>git push MY_REMOTE :XXX</code> (identical to above)</p>
+- <code>git push --set-upstream remote_name local_branch</code>
+- <code>git pull --set-upstream remote_name local_branch</code></p>
+<p>Delete branch:</p>
+<ul>
+<li><code>git branch -d xxx</code></li>
+<li><code>git branch -D xxx</code> (force delete)</li>
+<li><code>git push MY_REMOTE --delete XXX</code></li>
+<li><code>git push MY_REMOTE :XXX</code> (identical to above)</li>
+</ul>
 <p>Move branch
 * <code>git checkout OLD_NAME</code>
 * <code>git branch -m NEW_NAME</code></p>
diff --git a/mkdocs/mkdocs.yml b/mkdocs/mkdocs.yml
new file mode 100644 (file)
index 0000000..aefe3d7
--- /dev/null
@@ -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 (file)
index 0000000..a179585
--- /dev/null
@@ -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 (file)
index 0000000..e69de29
index e5d110d9003b185f8c25a472ef845d8dd285d85d..b2e9c4467c341c69836e2092abe38a9f4af050b5 100644 (file)
@@ -998,7 +998,7 @@ All the flags not part of an input files (after the last <code>-i</code>) target
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>
index 0d6c14b0c749a986455d6dce2ef96f9c3e3022b9..7178f28b492469146aa1cc023a5591ff5d28fff1 100644 (file)
@@ -705,7 +705,7 @@ xrandr --fb 1574x884 --output eDP1 --mode 1366x768 --panning 1574x886 --scale 1.
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>
index 6234537b70a02dbabe02e262d1fe05ca5586fdcb..a8b7781f0e21b75a3a68d5bd188de51ea9909561 100644 (file)
Binary files a/sitemap.xml.gz and b/sitemap.xml.gz differ
index f4f2ecfa8cf8b32cfc4ab9a16a2ab4834ac54941..56ce40de7a6d5b7dc1cc57720faeea8c8d791f24 100644 (file)
@@ -566,7 +566,7 @@ h1 :has(h2) { margin: 0 0 0.25rem 0; } /* less margin if a H2 follows it */
     
       <script src="../assets/javascripts/bundle.c8d2eff1.min.js"></script>
       
-        <script src="../assets/external/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
+        <script src="../https:/unpkg.com/mermaid@10.7.0/dist/mermaid.min.js"></script>
       
     
   </body>