From aa3549059ee962bae9102ce38401165d1c6678a5 Mon Sep 17 00:00:00 2001
From: simatec <nais@gmx.net>
Date: Mon, 23 Jan 2023 21:37:49 +0100
Subject: [PATCH] (simatec) Beta v0.9.1

---
 README.md        |  4 ++++
 build/build.sh   |  4 ++--
 install-piler.sh | 11 ++++++-----
 update.sh        | 31 ++++++++++++++++++++-----------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 954fb0b..0248d4e 100644
--- a/README.md
+++ b/README.md
@@ -145,6 +145,10 @@ To leave the container on the console you have to execute 2x `exit`.
 
 ## Changelog
 
+### 0.9.1 (23.01.2023)
+* (simatec) Piler Docker Hub added
+* (simatec) Fix Automatic Import
+
 ### 0.9.0 (23.01.2023)
 * (simatec) Piler Build added
 * (simatec) Piler Import Option added
diff --git a/build/build.sh b/build/build.sh
index 1a7ba24..1063f47 100644
--- a/build/build.sh
+++ b/build/build.sh
@@ -12,10 +12,10 @@ chmod a+x start.sh
 . ./build.conf
 
 # set Piler Version
-sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf
+#sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ../piler.conf
 
 # set Maria-DB Version
-sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ../piler.conf
+#sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ../piler.conf
 
 
 # Package Download
diff --git a/install-piler.sh b/install-piler.sh
index e44e9f8..8835917 100644
--- a/install-piler.sh
+++ b/install-piler.sh
@@ -287,10 +287,10 @@ if [ ! -f $installPth/.env ]; then
 fi
 
 # Build Piler
-cd $buildPth
-echo echo "${greenBold}Start Piler-Build...${normal}" && \
-bash build.sh && \
-echo "${greenBold}Piler-Build finish${normal}"
+#cd $buildPth
+#echo "${greenBold}Start Piler-Build...${normal}" && \
+#bash build.sh && \
+#echo "${greenBold}Piler-Build finish${normal}"
 
 if [ -f $installPth/docker-compose.yml ]; then
     rm $installPth/docker-compose.yml
@@ -428,6 +428,8 @@ cat >> $etcPth/config-site.php <<EOF
 EOF
 
 if [ "$AUTO_IMPORT" = true ]; then
+chown root:crontab $cronPth/piler
+
 cat >> $cronPth/piler <<EOF
 ### Piler import added by Piler-Installer
 */5 * * * * /usr/libexec/piler/import.sh
@@ -488,7 +490,6 @@ else
     docker-compose restart piler
 fi
 
-
 echo
 echo "${greenBold}${HLINE}"
 echo "${greenBold}             Piler install completed successfully"
diff --git a/update.sh b/update.sh
index d7e8d03..a0b3988 100644
--- a/update.sh
+++ b/update.sh
@@ -110,13 +110,6 @@ configPth="$installPth/config"
 etcPth="/var/lib/docker/volumes/piler-docker_piler_etc/_data"
 buildPth="$installPth/build"
 
-# config load
-. ./piler.conf
-
-if [ ! -f $installPth/.env ]; then
-  ln -s ./piler.conf .env
-fi
-
 if [ -f $installPth/docker-compose.yml ]; then
   rm $installPth/docker-compose.yml
 fi
@@ -156,6 +149,22 @@ for buildUpdate in start.sh build.sh Dockerfile build.conf; do
   echo
 done
 
+# build config load
+. .$buildPth/build.conf
+
+# set Piler Version
+sed -i 's/PILER_VERSION=.*/PILER_VERSION="'$PILER_VERSION'"/g' ./piler.conf
+
+# set Maria-DB Version
+sed -i 's/MARIA_DB_VERSION=.*/MARIA_DB_VERSION="'$MARIA_DB_VERSION'"/g' ./piler.conf
+
+# config load
+. ./piler.conf
+
+if [ ! -f $installPth/.env ]; then
+  ln -s ./piler.conf .env
+fi
+
 # old docker stop
 cd $installPth
 
@@ -181,10 +190,10 @@ if [ ! -f $etcPth/MANTICORE ]; then
 fi
 
 # Build Piler
-cd $buildPth
-echo "${greenBold}Start Piler-Build...${normal}" && \
-bash build.sh && \
-echo "${greenBold}Piler-Build finish${normal}"
+#cd $buildPth
+#echo "${greenBold}Start Piler-Build...${normal}" && \
+#bash build.sh && \
+#echo "${greenBold}Piler-Build finish${normal}"
 
 # Copy docker-compose.yml
 if [ "$USE_LETSENCRYPT" = "yes" ]; then