Merge branch 'development' into new/whitelist-regex-support

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-08-22 14:19:51 +02:00
commit 1820c2c598
No known key found for this signature in database
GPG key ID: FB60471F0575164A
12 changed files with 151 additions and 34 deletions

View file

@ -11,9 +11,12 @@
# Please see LICENSE file for your rights under this license.
upgrade_gravityDB(){
local database auditFile version
local database piholeDir auditFile version
database="${1}"
auditFile="${2}"
piholeDir="${2}"
auditFile="${piholeDir}/auditlog.list"
# Get database version
version="$(sqlite3 "${database}" "SELECT \"value\" FROM \"info\" WHERE \"property\" = 'version';")"
if [[ "$version" == "1" ]]; then