Changeset 5911 for trunk/centreon/libinstall/functions

Timestamp:

07/24/08 15:12:02 (4 months ago)

Author:

watt

Message:

Install Script: change warning message on sudo's config problem. (ticket #76)

Files:

• trunk/centreon/libinstall/functions (modified) (11 diffs)

trunk/centreon/libinstall/functions

@@ -20 +20 @@
 fail="$(gettext "FAIL")"
 passed="$(gettext "PASSED")"
+warning="$(gettext "WARNING")"
 critical="$(gettext "CRITICAL")"
 # Init binary to empty to use pathfind or manual define
@@ -202 +203 @@
         local res="not_define"
         while [ "$res" != "$yes" ] && [ "$res" != "$no" ] && [ ! -z "$res" ] ; do
-                echo -e "\n$message\n`gettext \"[y/n], default to [$default]:\"`"
+                echo -e "\n$message\n$(gettext "[y/n], default to [$default]:")"
                 echo -en "> "
                 read res
@@ -229 +230 @@
         local first=0
         while [ ! -d "$res" ] ; do
-                [ $first -eq 1 ] && echo_passed "`gettext \"\$res is not a directory or does not exist.\"`" "$critical" 
+                [ $first -eq 1 ] && echo_passed "$(gettext "\$res is not a directory or does not exist.")" "$critical" 
                 echo -e "\n$message"
-                [ "$default" != "NO_DEFAULT" ] && echo -e "`gettext \"default to [$default]\"`"
+                [ "$default" != "NO_DEFAULT" ] && echo -e "$(gettext "default to [$default]")"
                 echo -en "> "
                 read res
@@ -238 +239 @@
                 fi
                 if [ -z ${res#/} ] ; then
-                        echo_passed  "`gettext \"You select slash...\"`"
+                        echo_passed  "$(gettext "You select slash...")"
                         res="not_define"
                 else
@@ -263 +264 @@
         local first=0
         while [ ! -d "$res" ] ; do
-                [ $first -eq 1 ] && echo_passed "`gettext \"Directory \$res does not exists. \"`" "$critical"
+                [ $first -eq 1 ] && echo_passed "$(gettext "Directory \$res does not exists.")" "$critical"
                 echo -e "\n$message"
-                [ "$default" != "NO_DEFAULT" ] && echo -e "`gettext \"default to\"` [$default]"
+                [ "$default" != "NO_DEFAULT" ] && echo -e "$(gettext "default to") [$default]"
                 echo -en "> "
                 read res
@@ -272 +273 @@
                 fi
                 if [ -z "${res#/}" -o "$yes" = "$res" -o "$no" = "$res" ] ; then
-                        echo_passed  "`gettext \"You select slash...\"`"
+                        echo_passed  "$(gettext "You select slash...")"
                         res="not_define"
                 else 
                         first=1
                         [ -d "$res" ] && break 
-                        yes_no_default "`gettext \"Do you want me to create this directory ?\"` [$res]"
+                        yes_no_default "$(gettext "Do you want me to create this directory ?") [$res]"
                         if [ $? -eq 0 ] ; then
                                 mkdir -p $res
                                 if [ $? -ne 0 ] ; then
-                                        echo_passed "`gettext \"Could not create directory.\"`" "$critical"
+                                        echo_passed "$(gettext "Could not create directory.")" "$critical"
                                         #continue
                                 fi
-                                log "INFO" "`gettext \"Creating\"` : $res"
+                                log "INFO" "$(gettext "Creating") : $res"
                         fi
                 fi
@@ -307 +308 @@
         local first=0
         while [ ! -f "$res" ] ; do
-                [ $first -eq 1 ] && echo_passed "`gettext \"\$res is not a valid file.\"`" "$critical" 
+                [ $first -eq 1 ] && echo_passed "$(gettext "\$res is not a valid file.")" "$critical" 
                 echo -e "\n$message"
-                [ "$default" != "NO_DEFAULT" ] && echo -e "`gettext \"default to\"` [$default]"
+                [ "$default" != "NO_DEFAULT" ] && echo -e "$(gettext "default to") [$default]"
                 echo -en "> "
                 read res
@@ -385 +386 @@
 ## @Globals     NAGIOS_ETC, DEFAULT_NAGIOS_ETC
 #----
-function locate_nagios_etcdir() {
+function locate_nagios_etcdir() {/
         if [ -z "$NAGIOS_ETC" ] ; then
-                answer_with_testfile "$(gettext "Where is your nagios config file")" "$DEFAULT_NAGIOS_ETC/nagios.cfg" "NAGIOS_ETC"
-                NAGIOS_ETC="$(dirname $NAGIOS_ETC)"
+                answer_with_testdir "$(gettext "Where is your nagios config directory")" "$DEFAULT_NAGIOS_ETC" "NAGIOS_ETC"
                 echo_success "$(gettext "Path" ) $NAGIOS_ETC" "$ok"
         fi
@@ -453 +453 @@
 ## Define where is your nagiostats binary
 ## By default, use nagiostats,nagios2stats or nagios3stats name and find in PATH
-## @Globals     NAGIOSSTATS_BINARY, DEFAULT_NAGIOSSTATS_BINARY
+## @Globals     NAGIOSTATS_BINARY, DEFAULT_NAGIOSTATS_BINARY
 #----
 function locate_nagiostats_binary() {
@@ -466 +466 @@
                 done
                 if [ -z "$NAGIOSTATS_BINARY" ] ; then 
-                        answer_with_testfile "`gettext \"Where is your nagiostats binary ? \"`" "$DEFAULT_NAGIOSTATS_BINARY" "NAGIOSTATS_BINARY"
+                        answer_with_testfile "$(gettext "Where is your nagiostats binary ? ")" "$DEFAULT_NAGIOSTATS_BINARY" "NAGIOSTATS_BINARY"
                 fi
                 echo_success "$NAGIOSTATS_BINARY" "$ok"
@@ -1247 +1247 @@
         #Â Add a simple test for Defaults Requiretty problem on CentOS, Fedora...
         is_suspect_conf_sudo $SUDO_FILE
+        [ "$?" -eq 1 ] && echo_warning "$(gettext "For security policy, your sudo's configuration would only run when the user is logged into a real tty. Please adjust your configuration by commenting 'Defaults requiretty' line in your configuration file.)" "$warning"
         return 0
 }