From 390a62bd02a65fda889b6a22164015febc496b08 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Tue, 21 Mar 2023 19:39:23 +0100
Subject: [PATCH] update website

---
 .gitignore               |  1 +
 Makefile                 | 23 ++++++++++++++++++-----
 content/contents.lr      |  4 ++--
 packages/render-template |  2 +-
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8c8b9ba..6cffbba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # lektor
 packages/
 assets/svg/
+lektor/
 
 # ---> Vim
 # swap
diff --git a/Makefile b/Makefile
index 670ae78..933b9ed 100644
--- a/Makefile
+++ b/Makefile
@@ -8,18 +8,21 @@ all: build
 .ONESHELL:
 install:
 	if hash apt-get 2>/dev/null; then
-	  apt-get update -qq >/dev/null && apt-get install -qq apt-utils imagemagick python3-pip python3-setuptools gcc git-lfs
+	  apt-get update -qq >/dev/null && apt-get install -qq apt-utils imagemagick python3-pip python3-setuptools gcc git-lfs python3-venv
 	elif hash pacman 2>/dev/null; then
-	  pacman -Syu imagemagick python-pip glibc lib32-glibc gcc git-lfs --noconfirm
+	  pacman -Syu imagemagick python-pip glibc lib32-glibc gcc git-lfs python3-venv --noconfirm
 	elif hash dnf 2>/dev/null; then
 	  dnf install -y ImageMagick python3-pip gcc git-lfs
 	else
-	  echo -e "Please install Imagemagick, python3-pip git-lfs and gcc"
+	  echo -e "Please install Imagemagick, python3-pip git-lfs, python3-venv  and gcc"
 	fi
-	pip3 install wheel  --upgrade --user
-	pip3 install lektor --upgrade --user
+	pip3 install wheel  --upgrade
+	pip3 install lektor --upgrade
 
 build:
+	if [[ "$VIRTUAL_ENV" != "" ]]; then
+	  source lektor/bin/activate || python -m venv lektor && source lektor/bin/activate
+	fi
 	if python3 -m lektor --version 2>/dev/null; then
 	  python3 -m lektor build $(LEKTOR_PLUGIN_FLAGS)
 	else
@@ -27,6 +30,9 @@ build:
 	fi
 
 server:
+	if [[ "$VIRTUAL_ENV" != "" ]]; then
+	  source lektor/bin/activate || python -m venv lektor && source lektor/bin/activate
+	fi
 	if python3 -m lektor --version 2>/dev/null; then
 	  python3 -m lektor server $(LEKTOR_SERVER_FLAGS) $(LEKTOR_PLUGIN_FLAGS)
 	else
@@ -34,6 +40,10 @@ server:
 	fi
 
 dev:
+	if [[ "$VIRTUAL_ENV" != "" ]]; then
+	  source lektor/bin/activate || python -m venv lektor && source lektor/bin/activate
+	fi
+	lektor plugin flush-cache
 	lektor clean --yes
 	if python3 -m lektor --version 2>/dev/null; then
 	  python3 -m lektor server $(LEKTOR_SERVER_FLAGS) $(LEKTOR_PLUGIN_FLAGS)
@@ -42,6 +52,9 @@ dev:
 	fi
 
 deploy:
+	if [[ "$VIRTUAL_ENV" != "" ]]; then
+	  source lektor/bin/activate || python -m venv lektor && source lektor/bin/activate
+	fi
 	lektor clean --yes
 	lektor plugin flush-cache
 	lektor build $(LEKTOR_PLUGIN_FLAGS) $(LEKTOR_DEPLOY_FLAGS)
diff --git a/content/contents.lr b/content/contents.lr
index e5d765f..a8458a0 100644
--- a/content/contents.lr
+++ b/content/contents.lr
@@ -19,9 +19,9 @@ gitearepo: https://backwesen.de/ansible/ansible_role_gitea.git
 ----
 no_galaxy: yes
 ----
-galaxy_name: do1jlr.gitea
+galaxy_name: l3d.gitea
 ----
-galaxy_url: https://galaxy.ansible.com/do1jlr/gitea
+galaxy_url: https://galaxy.ansible.com/l3d/gitea
 ----
 maintainance: well
 ----
diff --git a/packages/render-template b/packages/render-template
index 1fd71ef..fe489cd 160000
--- a/packages/render-template
+++ b/packages/render-template
@@ -1 +1 @@
-Subproject commit 1fd71eff13c3a01dccc5dc49c26857e84686a14c
+Subproject commit fe489cdea6ee621affd51888a0192fe9c28f84ab