Merge branch 'use-global-conf'

This commit is contained in:
6543 2019-05-11 18:43:00 +02:00
commit 4adb0d6b2f
2 changed files with 10 additions and 12 deletions

View File

@ -28,13 +28,12 @@
readonly mode=$(echo $1 | tr -d '-') readonly mode=$(echo $1 | tr -d '-')
readonly md5list="$2" readonly md5list="$2"
moviedir="$3" moviedir="$3"
}


{ #db #db
dbname="tt_test" dbname=$(grep -v '#' $globalconf | grep ^dbname= | sed "s|^dbname=||g" | tr -d '"')
dbhost="localhost" dbhost=$(grep -v '#' $globalconf | grep ^dbhost= | sed "s|^dbhost=||g" | tr -d '"')
dbuser="root" dbuser=$(grep -v '#' $globalconf | grep ^dbuser= | sed "s|^dbuser=||g" | tr -d '"')
dbpwd="" dbpwd=$(grep -v '#' $globalconf | grep ^dbpwd= | sed "s|^dbpwd=||g" | tr -d '"')
} }


function help() { function help() {

View File

@ -32,13 +32,12 @@
moviedir=""$(echo $moviedir | sed 's|/$||g')"" moviedir=""$(echo $moviedir | sed 's|/$||g')""
[ -z "$moviedir" ] && exit 255 #catch case moviedir="/" [ -z "$moviedir" ] && exit 255 #catch case moviedir="/"
readonly DATE=$(date '+%Y-%m-%d') readonly DATE=$(date '+%Y-%m-%d')
}


{ #db #db
dbname="tt_test" dbname=$(grep -v '#' $globalconf | grep ^dbname= | sed "s|^dbname=||g" | tr -d '"')
dbhost="localhost" dbhost=$(grep -v '#' $globalconf | grep ^dbhost= | sed "s|^dbhost=||g" | tr -d '"')
dbuser="root" dbuser=$(grep -v '#' $globalconf | grep ^dbuser= | sed "s|^dbuser=||g" | tr -d '"')
dbpwd="" dbpwd=$(grep -v '#' $globalconf | grep ^dbpwd= | sed "s|^dbpwd=||g" | tr -d '"')
} }


function help() { function help() {