From aedc3e5e7bb47ea4fcc0080e9b5ba46da8ce7d33 Mon Sep 17 00:00:00 2001
From: Jannik Badenhop <jannik.badenhop@capgemini.com>
Date: Mon, 14 Oct 2024 08:51:10 +0000
Subject: [PATCH] revert installation from image tar on fresh install, since
 moodle setup needs to happen on fresh install to init the DB

---
 moodle/scripts/init/entrypoint.sh  | 2 +-
 moodle/scripts/init/updateCheck.sh | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/moodle/scripts/init/entrypoint.sh b/moodle/scripts/init/entrypoint.sh
index d8e5aee..b138690 100644
--- a/moodle/scripts/init/entrypoint.sh
+++ b/moodle/scripts/init/entrypoint.sh
@@ -105,8 +105,8 @@ upgrade_if_pending
 MODULE=dbp info "Replacing config files with ours"
 /bin/cp -p /moodleconfig/config.php /bitnami/moodle/config.php
 /bin/cp /moodleconfig/php.ini /opt/bitnami/php/etc/conf.d/php.ini
-
 upgrade_if_pending
+
 if [[ ! -f "$update_failed_path" ]] && [[ ! -f "$plugin_state_failed_path" ]]; then
     MODULE=dbp info "Starting plugin installation"
     if /scripts/pluginCheck.sh; then
diff --git a/moodle/scripts/init/updateCheck.sh b/moodle/scripts/init/updateCheck.sh
index 3544193..1aecff6 100644
--- a/moodle/scripts/init/updateCheck.sh
+++ b/moodle/scripts/init/updateCheck.sh
@@ -59,8 +59,7 @@ main() {
     image_version="$APP_VERSION"
 
     if [[ -z "$installed_version" ]]; then
-        MODULE="dbp-update" info "No installed Moodle version detected. Installing Moodle..."
-        install_new_version "$image_version"
+        MODULE="dbp-update" info "No installed Moodle version detected, continuing with bitnami fresh install"
         exit 0
     fi
     comp_result="$(compare_semver "$installed_version" "$image_version")"