Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3445
Modified Files:
monetdb
Log Message:
Fix up previous commit a bit
Index: monetdb
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/monetdb,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- monetdb 29 May 2007 20:02:16 -0000 1.44
+++ monetdb 30 May 2007 06:40:36 -0000 1.45
@@ -52,7 +52,7 @@
fi
# emit a warning
-> -echo " * warning: This script is experimental"
+echo " * warning: This script is experimental"
ACTION="--status"
@@ -121,16 +121,9 @@
done
#echo "ARGS $ARGS"
-# check if the database farm exists
-if [ ! -d $DBFARM ]
-then
- echo "Creation of missing database storage area '$DBFARM'"
- mkdir -p $DBFARM
-fi
-if [ ! -d $DBFARM ]
-then
- echo "Database storage area '$DBFARM' is in accessible"
-fi
+# check if the database farm/logs exists
+[[ -d $DBFARM ]] || mkdir -p $DBFARM || echo "Failed to create $DBFARM!!!"
+[[ -d $DBLOGS ]] || mkdir -p $DBLOGS || echo "Failed to create $DBLOGS!!!"
function getPID ()
{
@@ -171,7 +164,7 @@
function start_mserver()
{
# make sure the configuration file is in place
- if [ ! -f $1/.monetdb.conf ]
+ if [ ! -f $DBFARM/$1/.monetdb.conf ]
then
cp $MONETDB5_PREFIX/etc/monetdb5.conf
$DBFARM/$1/.monetdb.conf
fi
@@ -189,7 +182,7 @@
fi
if [ "$ARGS" = "" ]
then
- if [ -f $1/.mserver5.args ]
+ if [ -f $DBFARM/$1/.mserver5.args ]
then
ARGS=`cat $DBFARM/$1/.mserver5.args`
else
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
