Merge bin/opensvc into bin/om and remove bin/opensvc

Point the nodemgr, svcmon, svcmgr symlinks to bin/om.
Create a opensvc symlink to bin/om, for backward compat.

bin/nodemgr

@@ -1 +1 @@
-opensvc
+om

bin/om

@@ -28,6 +28,45 @@ then
 fi
 
 INTER="$OSVC_PYTHON $OSVC_PYTHON_ARGS"
+BASENAME=`basename $0`
+
+case $BASENAME in
+om)
+	;;
+opensvc)
+	#
+	# Use me as the shebang for python modules to be garantied the
+	# same python requirements than the agent are met (ie 2.6+).
+	#
+	# Example: #!/usr/bin/env opensvc
+	#
+	exec "$OSVC_PYTHON" "$@"
+	;;
+nodemgr)
+	KIND=node
+	;;
+svcmgr)
+	KIND=svc
+	;;
+volmgr)
+	KIND=vol
+	;;
+usrmgr)
+	KIND=usr
+	;;
+secmgr)
+	KIND=sec
+	;;
+cfgmgr)
+	KIND=cfg
+	;;
+ccfgmgr)
+	KIND=ccfg
+	;;
+svcmon)
+	KIND=mon
+	;;
+esac
 
 main() {
 	if test -z "$OSVC_CONTEXT"
@@ -40,14 +79,19 @@ main() {
 			;;
 		esac
 	fi
+	if test -n "$KIND"
+	then
+		$SUDO PYTHONPATH="$OSVC_ROOT_PATH" $INTER $OSVC_PYTHON_ARGS -m opensvc $KIND "$@"
+		return $?
+	fi
 	test -z "$SUDO" && SUDO=env || SUDO="$SUDO OSVC_NAMESPACE=$OSVC_NAMESPACE"
 	case $1 in
 	ns)
 		echo "The 'om' alias must be sourced to handle ns actions" >&2
 		exit 1
 		;;
 	*)
-		$SUDO PYTHONPATH=$OSVC_ROOT_PATH $INTER -m opensvc "$@"
+		$SUDO PYTHONPATH="$OSVC_ROOT_PATH" $INTER $OSVC_PYTHON_ARGS -m opensvc "$@"
 		;;
 	esac
 }

bin/opensvc

@@ -0,0 +1 @@
+om

bin/svcmgr

@@ -1 +1 @@
-opensvc
+om

bin/svcmon

@@ -1 +1 @@
-opensvc
+om