mirror of
https://github.com/itiligent/Easy-Guacamole-Installer.git
synced 2025-12-13 18:02:32 +00:00
Compare commits
2 commits
56abf81ffd
...
04151be101
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04151be101 | ||
|
|
909970fe9e |
3 changed files with 9 additions and 4 deletions
|
|
@ -152,7 +152,7 @@ CRON_DENY_FILE="/etc/cron.deny" # Distro's cron deny file
|
||||||
|
|
||||||
# Script branding header
|
# Script branding header
|
||||||
echo
|
echo
|
||||||
echo -e "${GREYB}Guacamole ${GUAC_VERSION} Auto Installer."
|
echo -e "${GREYB}Guacamole ${GUAC_VERSION} Appliance Auto Installer"
|
||||||
echo -e " ${LGREEN}Powered by Itiligent"
|
echo -e " ${LGREEN}Powered by Itiligent"
|
||||||
echo
|
echo
|
||||||
echo
|
echo
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
## v1.6.0 is working. For install notes and issues see https://github.com/itiligent/Easy-Guacamole-Installer/issues/78
|
### v1.6.0 installer and upgrade script is working. User install & upgrade notes tracked in https://github.com/itiligent/Easy-Guacamole-Installer/issues/78
|
||||||
|
|
||||||
## Introduction
|
## Introduction
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,7 +101,7 @@ fi
|
||||||
|
|
||||||
# Script branding header
|
# Script branding header
|
||||||
echo
|
echo
|
||||||
echo -e "${GREYB}Guacamole Appliance Auto Upgrade Script."
|
echo -e "${GREYB}Guacamole Appliance Auto Upgrade Script"
|
||||||
echo -e " ${LGREEN}Powered by Itiligent"
|
echo -e " ${LGREEN}Powered by Itiligent"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
|
|
@ -231,7 +231,12 @@ if [[ "${INSTALL_MYSQL}" = true ]]; then
|
||||||
FILEVERSION=$(echo ${FILE} | grep -oP 'upgrade-pre-\K[0-9\.]+(?=\.)')
|
FILEVERSION=$(echo ${FILE} | grep -oP 'upgrade-pre-\K[0-9\.]+(?=\.)')
|
||||||
if [[ $(echo -e "${FILEVERSION}\n${OLD_GUAC_VERSION}" | sort -V | head -n1) == ${OLD_GUAC_VERSION} && ${FILEVERSION} != ${OLD_GUAC_VERSION} ]]; then
|
if [[ $(echo -e "${FILEVERSION}\n${OLD_GUAC_VERSION}" | sort -V | head -n1) == ${OLD_GUAC_VERSION} && ${FILEVERSION} != ${OLD_GUAC_VERSION} ]]; then
|
||||||
echo "Patching ${GUAC_DB} with ${FILE}"
|
echo "Patching ${GUAC_DB} with ${FILE}"
|
||||||
mysql -u root -D ${GUAC_DB} -h ${MYSQL_HOST} -P ${MYSQL_PORT} <guacamole-auth-jdbc-${NEW_GUAC_VERSION}/mysql/schema/upgrade/${FILE} &>>${INSTALL_LOG}
|
|
||||||
|
if [[ ! -z "$MYSQL_ROOT_PWD" ]]; then
|
||||||
|
mysql -u root -p${MYSQL_ROOT_PWD} -D ${GUAC_DB} -h ${MYSQL_HOST} -P ${MYSQL_PORT} <guacamole-auth-jdbc-${NEW_GUAC_VERSION}/mysql/schema/upgrade/${FILE} &>>${INSTALL_LOG}
|
||||||
|
else
|
||||||
|
mysql -u root -D ${GUAC_DB} -h ${MYSQL_HOST} -P ${MYSQL_PORT} <guacamole-auth-jdbc-${NEW_GUAC_VERSION}/mysql/schema/upgrade/${FILE} &>>${INSTALL_LOG}
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [[ $? -ne 0 ]]; then
|
if [[ $? -ne 0 ]]; then
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue