Skip to content

Commit

Permalink
more silence for figlet checks
Browse files Browse the repository at this point in the history
  • Loading branch information
centminmod committed Feb 12, 2016
1 parent 98384c9 commit d247f39
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
14 changes: 7 additions & 7 deletions inc/nginx_install.inc
Expand Up @@ -87,7 +87,7 @@ ngxinstallmain() {

if [[ "$NGINX_INSTALL" = [yY] ]]; then

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Install Nginx"
fi

Expand Down Expand Up @@ -256,7 +256,7 @@ then

fi

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "luajit install"
fi

Expand All @@ -265,7 +265,7 @@ luajitinstall
# Install nginx
cd $DIR_TMP

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Compiling Nginx"
fi

Expand All @@ -288,7 +288,7 @@ SET_NGINXVER=$(echo ${NGINX_VERSION} |sed -e 's|\.|0|g' | head -n1)

if [[ "$NGINXPATCH" = [yY] ]]; then

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Patch Nginx"
fi

Expand All @@ -301,7 +301,7 @@ fi

funct_nginxconfigure

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Make"
fi

Expand All @@ -320,7 +320,7 @@ funct_nginxconfigure
echo
fi

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Make Install"
fi

Expand Down Expand Up @@ -466,7 +466,7 @@ geoipphp
cecho "* nginx installed, Apache disabled" $boldgreen
echo "*************************************************"

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Installed"
fi

Expand Down
18 changes: 9 additions & 9 deletions inc/nginx_upgrade.inc
Expand Up @@ -127,7 +127,7 @@ fi
checknginxmodules() {
axelsetup
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Check Nginx Modules"
fi
Expand Down Expand Up @@ -296,7 +296,7 @@ fi # UALL
## grab newer custom written htpasswd.sh as well
gethtpasswdsh

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Auto Backup Conf Directories"
fi

Expand Down Expand Up @@ -407,7 +407,7 @@ then

fi

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "luajit install"
fi

Expand Down Expand Up @@ -436,7 +436,7 @@ if [[ "$(nginx -V 2>&1 | grep -Eo 'with-http_v2_module')" = 'with-http_v2_module
rm -rf nginx-${ngver}*
fi
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Compile Nginx"
fi
Expand All @@ -463,7 +463,7 @@ if [[ "$NGINXPATCH" = [yY] ]]; then
patchnginx
fi
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Configure"
fi
Expand All @@ -483,7 +483,7 @@ funct_nginxconfigure
# error check
################
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Make"
fi
Expand Down Expand Up @@ -538,7 +538,7 @@ echo ""
sleep "$NGINXUPGRADESLEEP"
fi
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Make Install"
fi
Expand Down Expand Up @@ -599,7 +599,7 @@ fi
geoinccheck
geoipphp
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Cleanup"
fi
Expand All @@ -626,7 +626,7 @@ find "$DIR_TMP" -maxdepth 1 ! -name "pcre-${NGINX_PCREVER}*" -name 'pcre-*' -exe
cecho "* nginx updated" $boldgreen
echo "*************************************************"
if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Updated"
fi
Expand Down
14 changes: 7 additions & 7 deletions inc/php_upgrade.inc
Expand Up @@ -99,7 +99,7 @@ autodetectinstallextensions() {

PHPEXTDIR_AUTODETECT=$(cat /usr/local/bin/php-config | awk '/^extension_dir/ {extdir=$1} END {gsub(/\047|extension_dir|=|)/,"",extdir); print extdir}')

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "PHP: Auto Detect Previous Extensions"
fi

Expand Down Expand Up @@ -184,7 +184,7 @@ done
funct_phpupgrade() {
axelsetup

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "PHP: Upgrade"
fi

Expand Down Expand Up @@ -314,7 +314,7 @@ else
AXELPHPUPGRADETARGZ=''
fi

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "PHP: Download"
fi

Expand Down Expand Up @@ -389,7 +389,7 @@ fi # PHPDIFF
#mkdir -p /usr/${LIBDIR}/mysql
#ln -s /usr/${LIBDIR}/libmysqlclient.so /usr/${LIBDIR}/mysql/libmysqlclient.so

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "PHP: Configure"
fi

Expand All @@ -410,7 +410,7 @@ funct_phpconfigure
# error check
################

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "PHP: Make"
fi

Expand All @@ -432,7 +432,7 @@ echo "make${MAKETHREADS}"
# error check
################

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "PHP: Make Install"
fi

Expand Down Expand Up @@ -633,7 +633,7 @@ fi
cecho "* PHP upgraded and auto reinstalled PHP extensions" $boldgreen
echo "***************************************************"

if [ -f "$(which figlet)" ]; then
if [ -f "$(which figlet >/dev/null 2>&1 )" ]; then
figlet -ckf standard "Nginx Upgraded"
fi

Expand Down

0 comments on commit d247f39

Please sign in to comment.