SOURCES: oracle-xe.init - simplify, leave status as last in usage

[glen]

Author: glen                         Date: Mon Mar 16 11:56:56 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- simplify, leave status as last in usage

---- Files affected:
SOURCES:
   oracle-xe.init (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/oracle-xe.init
diff -u SOURCES/oracle-xe.init:1.5 SOURCES/oracle-xe.init:1.6
--- SOURCES/oracle-xe.init:1.5	Sat Mar 14 19:05:50 2009
+++ SOURCES/oracle-xe.init	Mon Mar 16 12:56:51 2009
@@ -42,32 +42,32 @@
 fi
 
 confkernel() {
-  $(awk '
+  eval $(awk '
   function min(a, b) {return ((a < b)?a:b)}
   function max(a, b) {return ((a > b)?a:b)}
   
   BEGIN {
     getline < "/proc/sys/kernel/sem"
-    printf ("eval semmsl=%i\n", max(250, $1));
-    printf ("eval semmns=%i\n", max(32000, $2));
-    printf ("eval semopm=%i\n", max(100, $3));
-    printf ("eval semmni=%i\n", max(128, $4));
+    printf("semmsl=%i\n", max(250, $1));
+    printf("semmns=%i\n", max(32000, $2));
+    printf("semopm=%i\n", max(100, $3));
+    printf("semmni=%i\n", max(128, $4));
 
     getline < "/proc/sys/kernel/shmmax"
-    printf ("eval shmmax=%i\n", max(536870912, $1));
+    printf("shmmax=%i\n", max(536870912, $1));
 
     getline < "/proc/sys/kernel/shmmni"
-    printf ("eval shmmni=%i\n", max(4096, $1));
+    printf("shmmni=%i\n", max(4096, $1));
 
     getline < "/proc/sys/kernel/shmall"
-    printf ("eval shmall=%i\n", max(2097152, $1));
+    printf("shmall=%i\n", max(2097152, $1));
     
     getline < "/proc/sys/fs/file-max"
-    printf ("eval filemax=%i\n", max(65536, $1));
+    printf("filemax=%i\n", max(65536, $1));
 
     getline < "/proc/sys/net/ipv4/ip_local_port_range"
-    printf ("eval ip_local_port_range_lb=%i\n", max(1024, $1));
-    printf ("eval ip_local_port_range_ub=%i\n", min(65000 $2));
+    printf("ip_local_port_range_lb=%i\n", max(1024, $1));
+    printf("ip_local_port_range_ub=%i\n", min(65000 $2));
   }')
 
   /sbin/sysctl -w kernel.sem="$semmsl $semmns $semopm $semmni"
@@ -80,48 +80,51 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/oracle-xe ]; then
-		confkernel
-		msg_starting 'oracle-xe listener'
-		daemon --user oracle $ORACLE_HOME/bin/lsnrctl start
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] || return 1
-
-		msg_starting 'oracle-xe database'
-		daemon --user oracle $ORACLE_HOME/bin/sqlplus -s /nolog @$ORACLE_HOME/config/scripts/startdb.sql
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			touch /var/lock/subsys/oracle-xe
-		else
-			msg_stopping 'oracle-xe listener'
-			daemon --user oracle $ORACLE_HOME/bin/lsnrctl stop
-		fi
-	else
+	if [ -f /var/lock/subsys/oracle-xe ]; then
 		msg_already_running oracle-xe
+		return
 	fi
-}
 
-stop() {
-	if [ -f /var/lock/subsys/oracle-xe ]; then
-		# Stop daemons.
-		msg_stopping 'oracle-xe database'
-		daemon --user oracle $ORACLE_HOME/bin/sqlplus -s /nolog @$ORACLE_HOME/config/scripts/stopdb.sql
+	confkernel
+	msg_starting 'oracle-xe listener'
+	daemon --user oracle $ORACLE_HOME/bin/lsnrctl start
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] || return 1
+
+	msg_starting 'oracle-xe database'
+	daemon --user oracle $ORACLE_HOME/bin/sqlplus -s /nolog @$ORACLE_HOME/config/scripts/startdb.sql
+	RETVAL=$?
+	if [ $RETVAL -eq 0 ]; then
+		touch /var/lock/subsys/oracle-xe
+	else
 		msg_stopping 'oracle-xe listener'
 		daemon --user oracle $ORACLE_HOME/bin/lsnrctl stop
-		rm -f /var/lock/subsys/oracle-xe
-	else
+	fi
+}
+
+stop() {
+	if [ ! -f /var/lock/subsys/oracle-xe ]; then
 		msg_not_running oracle-xe
+		return
 	fi
+
+	# Stop daemons.
+	msg_stopping 'oracle-xe database'
+	daemon --user oracle $ORACLE_HOME/bin/sqlplus -s /nolog @$ORACLE_HOME/config/scripts/stopdb.sql
+	msg_stopping 'oracle-xe listener'
+	daemon --user oracle $ORACLE_HOME/bin/lsnrctl stop
+	rm -f /var/lock/subsys/oracle-xe
 }
 
 condrestart() {
-	if [ -f /var/lock/subsys/oracle-xe ]; then
-		stop
-		start
-	else
+	if [ ! -f /var/lock/subsys/oracle-xe ]; then
 		msg_not_running oracle-xe
 		RETVAL=$1
+		return
 	fi
+
+	stop
+	start
 }
 
 checkstatus() {
@@ -129,6 +132,7 @@
 		# Stop daemons.
 		show 'Checking if oracle-xe is alive'
 		daemon --user oracle $ORACLE_HOME/bin/lsnrctl status
+		# XXX $1?
 		return $1
 	else
 		msg_not_running oracle-xe
@@ -138,10 +142,10 @@
 
 initialize() {
   $(/usr/share/oracle/scripts/sgapga.awk /proc/meminfo)
-  /bin/sed -i "s/%sga_target%/$sga/g" $ORACLE_HOME/config/scripts/init.ora
-  /bin/sed -i "s/%pga_aggregate_target%/$pga/g" $ORACLE_HOME/config/scripts/init.ora
-  /bin/sed -i "s/%sga_target%/$sga/g" $ORACLE_HOME/config/scripts/initXETemp.ora
-  /bin/sed -i "s/%pga_aggregate_target%/$pga/g" $ORACLE_HOME/config/scripts/initXETemp.ora
+  sed -i -e "s/%sga_target%/$sga/g" $ORACLE_HOME/config/scripts/init.ora
+  sed -i -e "s/%pga_aggregate_target%/$pga/g" $ORACLE_HOME/config/scripts/init.ora
+  sed -i -e "s/%sga_target%/$sga/g" $ORACLE_HOME/config/scripts/initXETemp.ora
+  sed -i -e "s/%pga_aggregate_target%/$pga/g" $ORACLE_HOME/config/scripts/initXETemp.ora
 }
 
 
@@ -164,15 +168,14 @@
   force-reload)
 	condrestart 7
 	;;
-  status)
-  	echo Not implemented yet.
-	checkstatus
-	;;
   init)
   	initialize
 	;;
+  status)
+	checkstatus
+	;;
   *)
-	msg_usage "$0 {start|stop|restart|try-restart|force-reload|status|init}"
+	msg_usage "$0 {start|stop|restart|try-restart|force-reload|init|status}"
 	exit 3
 esac
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/oracle-xe.init?r1=1.5&r2=1.6&f=u