From ce270e5168a8e282ed188ef38c86570df1ee594c Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Tue, 19 Dec 2023 13:17:56 -0800
Subject: [PATCH] cleaned up install process

---
 bin/install_extensions.sh        |  8 ++++----
 bin/joomla_cleanup.sh            |  3 +++
 bin/joomla_install.sh            |  1 +
 bin/password-generate-for-env.sh | 21 ---------------------
 4 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 bin/password-generate-for-env.sh

diff --git a/bin/install_extensions.sh b/bin/install_extensions.sh
index 8de2fa7..237ec99 100644
--- a/bin/install_extensions.sh
+++ b/bin/install_extensions.sh
@@ -8,17 +8,17 @@ fi
 
 # Template
 # [GitHub](https://github.com/templaza/astroid-framework)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/templaza/astroid-framework/releases/download/v2.6.5/astroid-package-v2.6.5.Framework-Template.zip
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=hhttps://github.com/templaza/astroid-framework/releases/download/v3.0.7/astroid-framework-3.0.7.zip
 
 # Sitemap
 # [GitHub](https://github.com/joomlashack/OSMap)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://deploy.ostraining.com/client/download/free/latest-stable/com_osmap
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/joomlashack/OSMap/releases/download/v5.0.15/com_osmap_free_5.0.15.zip
 
 # Comments
 # [Download page](https://www.akeeba.com/download/engage/3-2-5.html)
 # [Github](https://github.com/akeeba/engage)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://www.akeeba.com/download/engage/3-2-5/pkg-engage-3-2-5-zip.zip
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://www.akeeba.com/download/engage/3-3-3/pkg-engage-3-3-3-zip.zip
 
 # Contact Form
 # [GitHub](https://github.com/mavrosxristoforos/rapid-contact)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/mavrosxristoforos/rapid-contact/releases/download/1.4.27/mod_rapid_contact.zip
\ No newline at end of file
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/mavrosxristoforos/rapid-contact/releases/download/1.4.37/mod_rapid_contact.zip
\ No newline at end of file
diff --git a/bin/joomla_cleanup.sh b/bin/joomla_cleanup.sh
index aa4bd7d..c3e696d 100644
--- a/bin/joomla_cleanup.sh
+++ b/bin/joomla_cleanup.sh
@@ -84,5 +84,8 @@ rm -f html/README.txt
 rm -rf bin/inc_new_project
 rm -rf bin/joomla_new_project.sh
 rm -rf bin/joomla_install.sh
+rm -rf bin/install_extensions.sh
+
+rm $0
 
 echo "Now check the results and commit them to Git"
diff --git a/bin/joomla_install.sh b/bin/joomla_install.sh
index a0b49e9..eba0792 100644
--- a/bin/joomla_install.sh
+++ b/bin/joomla_install.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Runs the joomla cli through docker
 
 PROJECTNAME=$(basename "$(pwd)")
 
diff --git a/bin/password-generate-for-env.sh b/bin/password-generate-for-env.sh
deleted file mode 100644
index 0be8607..0000000
--- a/bin/password-generate-for-env.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Function to generate a random password using passgen
-generate_password() {
-    pwgen -cnsB1v 12
-}
-
-# Get the name of the current directory (project name)
-PROJECT_NAME=$(basename "$(pwd)")
-MYSQL_USER="${PROJECT_NAME}_joomla_user"
-MYSQL_DATABASE="${PROJECT_NAME}_joomla_db"
-
-echo "Generated passwords:"
-
-# Generate passwords for specific variables and print them to CLI
-echo "MYSQL_ROOT_PASSWORD=$(generate_password)"
-echo "MYSQL_USER=$MYSQL_USER"
-echo "MYSQL_DATABASE=$MYSQL_DATABASE"
-echo "MYSQL_PASSWORD=$(generate_password)"
-echo "MYSQL_DATABASE=$MYSQL_DATABASE"
-echo "JOOMLA_PASSWORD=$(generate_password)"