[Pkg-grid-commits] nws/debian/patches nws_setup,1.4,1.5

[Martin Quinson]

Update of /cvsroot/pkg-grid/nws/debian/patches
In directory haydn:/tmp/cvs-serv24066

Modified Files:
	nws_setup 
Log Message:
There is no forecaster anymore in NWS

Index: nws_setup
===================================================================
RCS file: /cvsroot/pkg-grid/nws/debian/patches/nws_setup,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nws_setup	7 Dec 2004 16:40:07 -0000	1.4
+++ nws_setup	7 Dec 2004 20:45:35 -0000	1.5
@@ -27,9 +27,9 @@
 %diffstat
  Interface/Makefile  |   16 
  Interface/nws.conf  |  154 +++++++++
- Interface/nws_setup |  853 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Interface/nws_setup |  852 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  Makedefs.in         |    1 
- 4 files changed, 1022 insertions(+), 2 deletions(-)
+ 4 files changed, 1021 insertions(+), 2 deletions(-)
  Interface/Makefile  |   16 
  Interface/nws.conf  |  154 +++++++++
  Interface/nws_setup |  853 ++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -64,9 +64,9 @@
  install:
  	@echo "Installing user commands ..."
 @@ -61,6 +64,9 @@ install:
-  	fi; done
-  	@mv nws_hostadmin.1 nws-hostadmin.1
-  	@mv nws_html_hosts.1 html-hosts.1
+ 	fi; done
+ 	@mv nws_hostadmin.1 nws-hostadmin.1
+ 	@mv nws_html_hosts.1 html-hosts.1
 +	@echo "Installing configuration files ..."
 +	@$(INSTALL) -d $(etcdir)
 +	@$(CP) $(CONF) $(etcdir)
@@ -249,7 +249,7 @@
 ===================================================================
 --- /dev/null
 +++ nws-2.11/Interface/nws_setup
-@@ -0,0 +1,853 @@
+@@ -0,0 +1,852 @@
 +#! /usr/bin/perl -w
 +# My personal script to manage to NWS familly of daemons.
 +# Contrary to the upstream provided scripts, it does not
@@ -550,16 +550,14 @@
 +	if (-x "$pathpart/nws_sensor" &&
 +	    -x "$pathpart/nws_nameserver" &&
 +	    -x "$pathpart/nws_memory" &&
-+	    -x "$pathpart/nws_forecast" && 
 +	    -x "$pathpart/nws_ctrl" &&
-+	    (-x "$pathpart/nws_start_activity"|| 
-+	     -x "$pathpart/start_activity")) {
++	    (-x "$pathpart/nws_start_activity"|| -x "$pathpart/start_activity")) {
 +	    $bin_path=$pathpart;
 +	    last;
 +	} 
 +    }
-+    if (-z $bin_path) {
-+	die "Unable to find the nws binaries in your PATH. Please fix it\n";
++    unless ($bin_path =~ /\W/) {
++	die "Unable to find the nws binaries in your PATH. Please fix it.\n";
 +    }
 +    $config{'bin_path'}="$bin_path";
 +    
@@ -813,6 +811,7 @@
 +    if ($cmd eq 'config') {
 +	my $err=0;
 +	print "Used configuration file: $conffile\n";
++	print "Path to binaries used: '".$config{'bin_path'}."'\n";
 +    	print "This machine is named '$hostname'";
 +	if ($my_group) {
 +	    print ", and belongs to group '$my_group'\n";