Merge branch 'ent-11472-casque-de-instalacion-del-script-online-no-te-deja-porque-dice-que-hay-un-pandora-ya-instalado' into 'develop'
11472 remove pandora_agent from the pre check environment online installation tool See merge request artica/pandorafms!6046
This commit is contained in:
commit
42b68eac98
|
@ -82,7 +82,7 @@ check_pre_pandora () {
|
||||||
export MYSQL_PWD=$DBPASS
|
export MYSQL_PWD=$DBPASS
|
||||||
|
|
||||||
echo -en "${cyan}Checking environment ... ${reset}"
|
echo -en "${cyan}Checking environment ... ${reset}"
|
||||||
rpm -qa | grep 'pandorafms_' &>> /dev/null && local fail=true
|
rpm -qa | grep 'pandorafms_' | grep -v pandorafms_agent_* | grep -v "pandorawmic" &>> /dev/null && local fail=true
|
||||||
[ -d "$PANDORA_CONSOLE" ] && local fail=true
|
[ -d "$PANDORA_CONSOLE" ] && local fail=true
|
||||||
[ -f /usr/bin/pandora_server ] && local fail=true
|
[ -f /usr/bin/pandora_server ] && local fail=true
|
||||||
echo "use $DBNAME" | mysql -uroot -P$DBPORT -h$DBHOST &>> /dev/null && local fail=true
|
echo "use $DBNAME" | mysql -uroot -P$DBPORT -h$DBHOST &>> /dev/null && local fail=true
|
||||||
|
|
|
@ -84,7 +84,7 @@ check_cmd_status () {
|
||||||
check_pre_pandora () {
|
check_pre_pandora () {
|
||||||
|
|
||||||
echo -en "${cyan}Checking environment ... ${reset}"
|
echo -en "${cyan}Checking environment ... ${reset}"
|
||||||
rpm -qa | grep -v "pandorawmic" | grep 'pandorafms_' &>> /dev/null && local fail=true
|
rpm -qa | grep 'pandorafms_' | grep -v pandorafms_agent_* | grep -v "pandorawmic" &>> /dev/null && local fail=true
|
||||||
[ -d "$PANDORA_CONSOLE" ] && local fail=true
|
[ -d "$PANDORA_CONSOLE" ] && local fail=true
|
||||||
[ -f /usr/bin/pandora_server ] && local fail=true
|
[ -f /usr/bin/pandora_server ] && local fail=true
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue