install/mariadb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes at update mode.

Browse Source
This commit is contained in:
Christoph
2018-02-22 17:30:50 +01:00
parent 90983397a2
commit f47a080e3b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
install_mariadb.sh
View File

@@ -264,8 +264,8 @@ MY_CNF_FILE="${MARIADB_INSTALL_DIR}/etc/my.cnf"
if $UPDATE_MARIADB ; then if $UPDATE_MARIADB ; then
echo "" echo ""
echononl "Ermittle Installations Verz. der existierenden MARIADB Installation." echononl "Ermittle Installations Verz. der existierenden MARIADB Installation."
if [[ -d "$(dirname "$MARIADB_INSTALL_DIR")/maria-$CURRENT_VERSION" ]]; then if [[ -d "$(dirname "$MARIADB_INSTALL_DIR")/mariadb-$CURRENT_VERSION" ]]; then
MARIADB_CUR_INSTALL_DIR="$(dirname "$MARIADB_INSTALL_DIR")/maria-$CURRENT_VERSION" MARIADB_CUR_INSTALL_DIR="$(dirname "$MARIADB_INSTALL_DIR")/mariadb-$CURRENT_VERSION"
echo_ok echo_ok
else else
echo_failed echo_failed
@@ -292,8 +292,8 @@ done
if $UPDATE_MARIADB ; then if $UPDATE_MARIADB ; then
echo "" echo ""
echononl "Ermittle MARIADB-Datenbank Verz. der existierenden MARIADB Installation." echononl "Ermittle MARIADB-Datenbank Verz. der existierenden MARIADB Installation."
if [[ -d "$(dirname "$MARIADB_DATA_DIR")/maria-$CURRENT_VERSION" ]]; then if [[ -d "$(dirname "$MARIADB_DATA_DIR")/mariadb-$CURRENT_VERSION" ]]; then
MARIADB_CUR_DATA_DIR="$(dirname "$MARIADB_DATA_DIR")/maria-$CURRENT_VERSION" MARIADB_CUR_DATA_DIR="$(dirname "$MARIADB_DATA_DIR")/mariadb-$CURRENT_VERSION"
echo_ok echo_ok
else else
echo_failed echo_failed
@@ -4186,7 +4186,7 @@ else
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Run 'mysql_upgrade -uroot' - this may take some (long) time" >> ${logdir}/main.log echo "## - Run 'mysql_upgrade -uroot' - this may take some (long) time" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
echo "${MARIADB_INSTALL_DIR}/bin/MARIADB_upgrade -uroot -p$MARIADB_ROOT_PW" >> ${logdir}/main.log echo "${MARIADB_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MARIADB_ROOT_PW" >> ${logdir}/main.log
${MARIADB_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MARIADB_ROOT_PW >> ${logdir}/main.log 2>&1 ${MARIADB_INSTALL_DIR}/bin/mysql_upgrade -uroot -p$MARIADB_ROOT_PW >> ${logdir}/main.log 2>&1
ret_val=$? ret_val=$?
if [[ $ret_val -eq 0 ]] ; then if [[ $ret_val -eq 0 ]] ; then
@@ -4214,9 +4214,9 @@ fi
_sys_maint_cnf_needed=false _sys_maint_cnf_needed=false
if $UPDATE_MARIADB ; then if $UPDATE_MARIADB ; then
echononl "Copy 'sys-maint.cnf from old installation to the new one.." echononl "Copy 'sys-maint.cnf' from old installation to the new one.."
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Copy 'sys-maint.cnf from old installation to the new one" >> ${logdir}/main.log echo "## - Copy 'sys-maint.cnf' from old installation to the new one" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
if [[ "$CURRENT_VERSION" = "$MARIADB_VERSION" ]] ; then if [[ "$CURRENT_VERSION" = "$MARIADB_VERSION" ]] ; then
echo "cp -a \"$MARIADB_INSTALL_DIR.$_backup_date/sys-maint.cnf\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \ echo "cp -a \"$MARIADB_INSTALL_DIR.$_backup_date/sys-maint.cnf\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \
@@ -4240,9 +4240,9 @@ if $UPDATE_MARIADB ; then
[[ $OK = "yes" ]] || fatal "Abbruch durch User" [[ $OK = "yes" ]] || fatal "Abbruch durch User"
fi fi
else else
echo "cp -a \"$(realpath ${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf)\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \ echo "cp -a \"$(realpath "${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf")\" \"${MARIADB_INSTALL_DIR}/sys-maint.cnf\"" \
>> ${logdir}/main.log >> ${logdir}/main.log
cp -a "$(realpath ${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf)" "${MARIADB_INSTALL_DIR}/sys-maint.cnf" \ cp -a "$(realpath "${MARIADB_CUR_INSTALL_DIR}/sys-maint.cnf")" "${MARIADB_INSTALL_DIR}/sys-maint.cnf" \
>> ${logdir}/main.log 2>&1 >> ${logdir}/main.log 2>&1
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
echo_ok echo_ok