Change handling od database files.
This commit is contained in:
@@ -211,7 +211,14 @@ fi
|
||||
|
||||
if [[ -n "$DATABASE_NAME" ]] ; then
|
||||
if [[ -z "$DATABASE_USER" || -z "$DATABASE_PASSWD" ]] ; then
|
||||
read_file=""
|
||||
if [[ -f "${working_dir}/databases/$DATABASE_NAME" ]]; then
|
||||
read_file="${working_dir}/databases/$DATABASE_NAME"
|
||||
elif [[ -f "${working_dir}/databases/DELETED/$DATABASE_NAME" ]]; then
|
||||
read_file="${working_dir}/databases/DELETED/$DATABASE_NAME"
|
||||
fi
|
||||
|
||||
if [[ -n "$read_file" ]]; then
|
||||
while read -r _db_name _db_user _db_pass ; do
|
||||
|
||||
# - if var '_db_name' begins with '#', that means the readed line
|
||||
@@ -230,7 +237,7 @@ if [[ -n "$DATABASE_NAME" ]] ; then
|
||||
break
|
||||
fi
|
||||
|
||||
done < "${working_dir}/databases/$DATABASE_NAME"
|
||||
done < "$read_file"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -416,6 +423,48 @@ else
|
||||
echo_ok
|
||||
fi
|
||||
|
||||
if ! $QUIET_MODE ; then
|
||||
echo ""
|
||||
fi
|
||||
|
||||
echononl " Create directory '${working_dir}/databases/DELETED'.."
|
||||
if [[ -d "${working_dir}/databases/DELETED" ]]; then
|
||||
echo_skipped
|
||||
else
|
||||
mkdir -p "${working_dir}/databases/DELETED" > $tmp_log_file 2>&1
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
echo_failed
|
||||
error "$(cat $tmp_log_file)"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
fi
|
||||
|
||||
echononl " Remove file '${working_dir}/databases/$DATABASE_NAME'"
|
||||
if [[ -f "${working_dir}/databases/$DATABASE_NAME" ]] ; then
|
||||
rm "${working_dir}/databases/$DATABASE_NAME" > $tmp_log_file 2>&1
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
echo_failed
|
||||
error "$(cat $tmp_log_file)"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
else
|
||||
echo_skipped
|
||||
fi
|
||||
|
||||
echononl " Create/Renew file '${working_dir}/databases/DELETED/$DATABASE_NAME'"
|
||||
cat <<EOF > "${working_dir}/databases/DELETED/$DATABASE_NAME" 2> $tmp_log_file 2>&1
|
||||
# <db-name> <db-user> <dp-pass>
|
||||
$DATABASE_NAME $DATABASE_USER $DATABASE_PASSWD
|
||||
EOF
|
||||
if [[ $? -ne 0 ]] ; then
|
||||
echo_failed
|
||||
error "$(cat $tmp_log_file)"
|
||||
else
|
||||
echo_ok
|
||||
fi
|
||||
|
||||
|
||||
if ! $QUIET_MODE ; then
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user