Modified ZM_PATH_UPDATE and sql script behaviour
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1938 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
afd229d375
commit
0055ecb026
|
@ -91,7 +91,7 @@ checkdb()
|
|||
echo tbls | grep Config >/dev/null 2>&1
|
||||
RETVAL=$?
|
||||
if [ $RETVAL != 0 ]; then
|
||||
cat $ZM_PATH_UPDATE/zmschema.sql | mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME
|
||||
mysql -B -h $ZM_DB_HOST -u $ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME < $ZM_PATH_UPDATE/zm_create.sql
|
||||
RETVAL=$?
|
||||
[ $RETVAL = 0 ] && echo_success
|
||||
[ $RETVAL != 0 ] && echo_failure
|
||||
|
|
|
@ -14,6 +14,7 @@ ZM_VERSION=@VERSION@
|
|||
|
||||
# Path to build directory, used mostly for finding DB upgrade scripts
|
||||
ZM_PATH_BUILD=@PATH_BUILD@
|
||||
ZM_PATH_UPDATE=@PATH_BUILD@/db
|
||||
|
||||
# Build time, used to record when to trigger various checks
|
||||
ZM_TIME_BUILD=@TIME_BUILD@
|
||||
|
@ -48,4 +49,3 @@ ZM_DB_USER=@ZM_DB_USER@
|
|||
|
||||
# ZoneMinder database password
|
||||
ZM_DB_PASS=@ZM_DB_PASS@
|
||||
|
||||
|
|
Loading…
Reference in New Issue