From: Enrico Scholz Date: Tue, 9 Mar 2004 02:01:34 +0000 (+0000) Subject: made 'status' silent when '--silent' is used X-Git-Tag: VERSION_0_10~401 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4517b4fe331a4ae925eed1ea282ba279d7df7286;p=util-vserver.git made 'status' silent when '--silent' is used git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1172 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/vserver b/util-vserver/scripts/vserver index 817d835..e93132d 100755 --- a/util-vserver/scripts/vserver +++ b/util-vserver/scripts/vserver @@ -108,6 +108,12 @@ function restart() exec "${SELF[@]}" "$vserver" start } +function msg() +{ + test -z "$OPTION_SILENT" || return 0 + echo "$@" +} + ### main starts here set +e @@ -231,16 +237,16 @@ case "$2" in status) if getVserverStatus "$VSERVER_DIR" ctx procnum; then - echo $"Vserver '$vserver' is running at context '$ctx'" + msg $"Vserver '$vserver' is running at context '$ctx'" if test "$2" = status; then - echo $"Number of processes:" $procnum - echo -n $"Uptime: " + msg $"Number of processes:" $procnum + msg -n $"Uptime: " "$_FILETIME" "$VSERVER_DIR/run" fi exit 0 else - echo $"Vserver '$vserver' is not running" + msg $"Vserver '$vserver' is not running" exit 1 fi ;;