From 4e5bfa49b4503a8fac5fe9fd476aea84bd7ab162 Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Thu, 20 Jun 2019 03:39:57 -0600 Subject: [PATCH] use dbnames from details file for dump --- seafbackup.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/seafbackup.sh b/seafbackup.sh index d66af2f..128bd0e 100755 --- a/seafbackup.sh +++ b/seafbackup.sh @@ -492,7 +492,8 @@ if [ -z "${sqlPass}" ]; then badDetails empty 'sqlPass' fi # database names -if [ -z "${ccnetDB_name}" ] || [ -z "${seafileDB_name}" ] || [ -z "${seahubDB_name}" ]; then +if [ -z "${ccnetDB_name}" ] || [ -z "${seafileDB_name}" ] || \ + [ -z "${seahubDB_name}" ]; then badDetails empty 'one or more mysql database names' fi @@ -516,17 +517,19 @@ sqlDump_seahub="backup-$(date +%Y%m%d_%H%M%S)_${seahubDB_name}.sql" ## dump databases # dump CCNET-DB if ! mysqldump -h"${sqlServer}" -u"${sqlUser}" -p"${sqlPass}" \ - --opt ccnet-db > "${sqlDumpDir}/${sqlDump_ccnet}" 2>> "$logFile"; then + --opt "${ccnetDB_name}" > "${sqlDumpDir}/${sqlDump_ccnet}" \ + 2>> "$logFile"; then exitError 115 "Could not dump ${ccnetDB_name} database" fi # dump SEAFILE-DB if ! mysqldump -h"${sqlServer}" -u"${sqlUser}" -p"${sqlPass}" \ - --opt ccnet-db > "${sqlDumpDir}/${sqlDump_seafile}" 2>> "$logFile"; then + --opt "${seafileDB_name}" > "${sqlDumpDir}/${sqlDump_seafile}" \ + 2>> "$logFile"; then exitError 116 "Could not dump ${seafileDB_name} database" fi # dump CCNET-DB if ! mysqldump -h"${sqlServer}" -u"${sqlUser}" -p"${sqlPass}" \ - --opt ccnet-db > "${sqlDumpDir}/${sqlDump_seahub}" 2>> "$logFile"; then + --opt "${seahubDB_name}" > "${sqlDumpDir}/${sqlDump_seahub}" 2>> "$logFile"; then exitError 117 "Could not dump ${seahubDB_name} database" fi printf "${ok}[%s] -- [SUCCESS] SQL databases dumped successfully --${norm}\n" \