Update of /cvsroot/monetdb/MonetDB5/src/tools
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19608
Modified Files:
mguardian monetdb
Log Message:
Reverting changes due to incomplete expert knowledge.
Index: monetdb
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/monetdb,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- monetdb 29 May 2007 09:38:02 -0000 1.43
+++ monetdb 29 May 2007 20:02:16 -0000 1.44
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!usr/bin/env bash
# The contents of this file are subject to the MonetDB Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
@@ -45,13 +45,14 @@
DBFARM=$MONETDB5_PREFIX/var/MonetDB5/dbfarm
DBLOGS=$MONETDB5_PREFIX/var/MonetDB5/dblogs
# First perform some sanity checks
-if [ "$MONETDB5_PREFIX" = "" ]
-then
+if [[ -z "$MONETDB5_PREFIX" = "" ]] ; then
echo "The MONETDB5_PREFIX environment variable has not been set"
- echo "It should point to where you have installed the build directory"
+ echo "It should point to the directory where you have installed the
build directory"
exit
fi
+# emit a warning
+> -echo " * warning: This script is experimental"
ACTION="--status"
@@ -109,7 +110,7 @@
;;
"--dbinit="* )
tail="${1#--dbinit=}"
- STARTUP=/tmp/mserver5.startup$$
+ STARTUP=${TMPDIR:-/var/tmp}/mserver5.startup$$
echo $tail > $STARTUP
;;
* )
@@ -131,12 +132,6 @@
echo "Database storage area '$DBFARM' is in accessible"
fi
-if [ ! -d $DBLOGS ]
-then
- echo "Creation of missing database storage area '$DBFARM'"
- mkdir -p $DBLOGS
-fi
-
function getPID ()
{
active=""
@@ -176,7 +171,7 @@
function start_mserver()
{
# make sure the configuration file is in place
- if [ ! -f $DBFARM/$1/.monetdb.conf ]
+ if [ ! -f $1/.monetdb.conf ]
then
cp $MONETDB5_PREFIX/etc/monetdb5.conf
$DBFARM/$1/.monetdb.conf
fi
@@ -194,7 +189,7 @@
fi
if [ "$ARGS" = "" ]
then
- if [ -f $DBFARM/$1/.mserver5.args ]
+ if [ -f $1/.mserver5.args ]
then
ARGS=`cat $DBFARM/$1/.mserver5.args`
else
Index: mguardian
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/tools/mguardian,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mguardian 29 May 2007 09:38:02 -0000 1.24
+++ mguardian 29 May 2007 20:02:16 -0000 1.25
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# The contents of this file are subject to the MonetDB Public License
# Version 1.1 (the "License"); you may not use this file except in
# compliance with the License. You may obtain a copy of the License at
-------------------------------------------------------------------------
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
