From 264a2e35d5b20bcb9855e0083e350f1ce8025ce6 Mon Sep 17 00:00:00 2001 From: stan Date: Wed, 15 Jan 2003 15:39:48 +0000 Subject: [PATCH] Added non-interactive warning and fixed typos. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@338 e3e1d417-86f3-4887-817a-d78f3d33393f --- zmconfig.pl.in | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/zmconfig.pl.in b/zmconfig.pl.in index b2def2a41..b7ae885ee 100755 --- a/zmconfig.pl.in +++ b/zmconfig.pl.in @@ -83,7 +83,7 @@ my @options = name => "ZM_PATH_BIN", default => "$bindir", description => "Path to the ZoneMinder executables, autogenerated do not change", - help => "The path where the ZoneMinder executables are installed is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the path." + help => "The path where the ZoneMinder executables are installed is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the path.", type => $types{abs_path}, readonly => 1, }, @@ -91,7 +91,7 @@ my @options = name => "ZM_PATH_WEB", default => "@WEB_PREFIX@", description => "Path to the ZoneMinder web files, autogenerated do not change", - help => "The path where the ZoneMinder web files are installed is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the path." + help => "The path where the ZoneMinder web files are installed is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the path.", type => $types{abs_path}, readonly => 1, }, @@ -99,7 +99,7 @@ my @options = name => "ZM_PATH_CGI", default => "@CGI_PREFIX@", description => "Path to the ZoneMinder cgi files, autogenerated do not change", - help => "The path where the ZoneMinder cgi files are installed is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the path." + help => "The path where the ZoneMinder cgi files are installed is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the path.", type => $types{abs_path}, readonly => 1, }, @@ -107,7 +107,7 @@ my @options = name => "ZM_WEB_USER", default => "@WEB_USER@", description => "User name of your httpd daemon user, autogenerated do not change", - help => "The user name of your httpd daemon user is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the user name." + help => "The user name of your httpd daemon user is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the user name.", type => $types{string}, readonly => 1, }, @@ -115,7 +115,7 @@ my @options = name => "ZM_WEB_GROUP", default => "@WEB_GROUP@", description => "User group of your httpd daemon user, autogenerated do not change", - help => "The user group of your httpd daemon user is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the user group." + help => "The user group of your httpd daemon user is set at configure time. This is a readonly option for the purposes of distributing this information around the various binaries and scripts that need to know it. Changing this option here will tend to break things. Instead re-run configure to regenerate the user group.", type => $types{string}, readonly => 1, }, @@ -721,6 +721,11 @@ if ( -s $config_file ) { loadOptions(); } +elsif ( !$interactive ) +{ + print( "Warning: Non-interative mode being used with no existing configuration information.\n" ); + print( " Using only default values which may not be appropriate or even work.\n" ); +} if ( $interactive ) {