martin: server/kolabd/kolabd/namespace/libexec showuser.in, 1.2, 1.3 start.in, 1.1, 1.2 stop.in, 1.1, 1.2

[cvs at intevation.de]

Author: martin

Update of /kolabrepository/server/kolabd/kolabd/namespace/libexec
In directory doto:/tmp/cvs-serv17356/namespace/libexec

Modified Files:
	showuser.in start.in stop.in 
Log Message:
Martin Konold: Cleaner sed usage. See also issue#1028. Patch from rbos


Index: showuser.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/showuser.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- showuser.in	12 Dec 2005 00:22:36 -0000	1.2
+++ showuser.in	12 Dec 2005 00:31:52 -0000	1.3
@@ -21,9 +21,9 @@
 fi
 
 server=127.0.0.1
-binddn=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_dn :" | sed -e "s;bind_dn : ;;"`
-bindpw=`cat @sysconfdir@/kolab/kolab.conf | grep "bind_pw :" | sed -e "s;bind_pw : ;;"`
-basedn=`cat @sysconfdir@/kolab/kolab.conf | grep "base_dn :" | sed -e "s;base_dn : ;;"`
+binddn=`sed -n "s;bind_dn : ;;p" @sysconfdir@/kolab/kolab.conf`
+bindpw=`sed -n "s;bind_pw : ;;p" @sysconfdir@/kolab/kolab.conf`
+basedn=`sed -n "s;base_dn : ;;p" @sysconfdir@/kolab/kolab.conf`
 
 
 if [ ".$1" = "." ]; then

Index: start.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/start.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- start.in	13 Sep 2005 14:38:22 -0000	1.1
+++ start.in	12 Dec 2005 00:31:52 -0000	1.2
@@ -14,8 +14,6 @@
 ##  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 ##
 
-prefix=@prefix@
-
 if [ ".$1" = ".--showhelp" ]; then
 	echo "Start the server"
 	exit 0
@@ -23,4 +21,4 @@
 fi
 
 
-${prefix}/bin/openpkg rc all start
+ at bindir@/openpkg rc all start

Index: stop.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/namespace/libexec/stop.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- stop.in	13 Sep 2005 14:38:22 -0000	1.1
+++ stop.in	12 Dec 2005 00:31:52 -0000	1.2
@@ -14,8 +14,6 @@
 ##  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
 ##
 
-prefix=@prefix@
-
 if [ ".$1" = ".--showhelp" ]; then
 	echo "Stop the server"
 	exit 0
@@ -23,4 +21,4 @@
 fi
 
 
-${prefix}/bin/openpkg rc all stop
+ at bindir@/openpkg rc all stop