diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a13b87..adc5355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ The following is a history of the changes made to this project. ## v2.8.2 *(in development)* :baby_chick: +### Installers + +* Added support for Ubuntu Jammy Jellyfish. +* Added support for Ubuntu Focal Fossa. + ### Portal * Fixed issue where navigation element toggling was not working in lite installs. diff --git a/README.md b/README.md index 79e9876..8fd4f03 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,8 @@ The project currently supports the following Linux distributions. * Debian Bullseye * Rasbperry PI OS (Bookworm) * Rasbperry PI OS Legacy (Bullseye) +* Ubuntu Jammy Jellyfish +* Ubuntu Focal Fossa ### Useful Links diff --git a/bash/feeders/piaware.sh b/bash/feeders/piaware.sh index 5309775..1d2ac9d 100755 --- a/bash/feeders/piaware.sh +++ b/bash/feeders/piaware.sh @@ -86,7 +86,6 @@ CheckPackage libboost-regex-dev CheckPackage libboost-filesystem-dev CheckPackage patchelf CheckPackage python3-pip -CheckPackage python3-build CheckPackage python3-setuptools CheckPackage python3-wheel CheckPackage net-tools @@ -96,6 +95,17 @@ CheckPackage itcl3 CheckPackage libssl-dev CheckPackage tcl-dev CheckPackage chrpath + +# Some older distros may need different packages than newer ones. +case ${RECEIVER_OS_CODE_NAME} in + focal) + CheckPackage python3-dev + ;; + *) + CheckPackage python3-build + ;; +esac + echo "" ## DOWNLOAD OR UPDATE THE TCLTLS REBUILD SOURCE @@ -185,10 +195,10 @@ fi # Execute build script. DIST="bookworm" case ${RECEIVER_OS_CODE_NAME} in - buster) + buster | focal) DIST="buster" ;; - bullseye) + bullseye | jammy) DIST="bullseye" ;; bookworm) diff --git a/bash/portal/install.sh b/bash/portal/install.sh index 0cf8279..4353193 100755 --- a/bash/portal/install.sh +++ b/bash/portal/install.sh @@ -240,6 +240,9 @@ fi DISTRO_PHP_VERSION="5" case $RECEIVER_OS_DISTRIBUTION in + ubuntu) + DISTRO_PHP_VERSION="" + ;; debian) if [[ $RECEIVER_OS_CODE_NAME = "bookworm" ]]; then DISTRO_PHP_VERSION="8.2"; fi if [[ $RECEIVER_OS_CODE_NAME = "bullseye" ]]; then DISTRO_PHP_VERSION="7.4"; fi @@ -424,7 +427,7 @@ if [[ "${RECEIVER_PORTAL_INSTALLED}" = "false" ]] && [[ "${ADVANCED}" = "true" ] # Attempt to login with the supplied MySQL administrator credentials. echo -e "\e[94m Attempting to log into the MySQL server using the supplied administrator credentials...\e[97m" - while ! mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e ";" ; do + while ! sudo mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e ";" ; do echo -e "\e[94m Unable to log into the MySQL server using the supplied administrator credentials...\e[97m" whiptail --backtitle "${RECEIVER_PROJECT_TITLE}" --title "Create Remote MySQL Database" --msgbox "The script was not able to log into the MySQL server using the administrator credentials you supplied. You will now be asked to reenter the MySQL server administrator credentials." 9 78 DATABASEADMINPASSWORD1="" @@ -466,20 +469,20 @@ if [[ "${RECEIVER_PORTAL_INSTALLED}" = "false" ]] && [[ "${ADVANCED}" = "true" ] # Create the database use and database using the information supplied by the user. echo -e "\e[94m Creating the MySQL database \"${DATABASENAME}\"...\e[97m" - mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "CREATE DATABASE ${DATABASENAME};" + sudo mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "CREATE DATABASE ${DATABASENAME};" echo -e "\e[94m Creating the MySQL user \"${DATABASEUSER}\"...\e[97m" if [[ "${LOCALMYSQLSERVER}" = "false" ]] ; then # If the databse resides on a remote server be sure to allow the newly created user access to it remotly. - mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "CREATE USER '${DATABASEUSER}'@'%' IDENTIFIED BY \"${DATABASEPASSWORD1}\";" + sudo mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "CREATE USER '${DATABASEUSER}'@'%' IDENTIFIED BY \"${DATABASEPASSWORD1}\";" else # Since this is a local database we will restrict this login to localhost logins only. - mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "CREATE USER '${DATABASEUSER}'@'localhost' IDENTIFIED BY \"${DATABASEPASSWORD1}\";" + sudo mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "CREATE USER '${DATABASEUSER}'@'localhost' IDENTIFIED BY \"${DATABASEPASSWORD1}\";" fi echo -e "\e[94m Granting priviledges on the MySQL database \"DATABASENAME\" to the user \"${DATABASEUSER}\"...\e[97m" - mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "GRANT ALL PRIVILEGES ON ${DATABASENAME}.* TO '${DATABASEUSER}'@'localhost';" + sudo mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "GRANT ALL PRIVILEGES ON ${DATABASENAME}.* TO '${DATABASEUSER}'@'localhost';" echo -e "\e[94m Flushing priviledges on the MySQL database server...\e[97m" - mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "FLUSH PRIVILEGES;" + sudo mysql -u${DATABASEADMINUSER} -p${DATABASEADMINPASSWORD1} -h ${DATABASEHOSTNAME} -e "FLUSH PRIVILEGES;" fi ## SETUP THE PERFORMANCE GRAPHS USING THE SCRIPT GRAPHS.SH diff --git a/logs/placeholder.txt b/logs/placeholder.txt deleted file mode 100644 index fcad817..0000000 --- a/logs/placeholder.txt +++ /dev/null @@ -1 +0,0 @@ -Placeholder file to make sure the logs folder is created