Skip to content

Commit

Permalink
add check for axel source compiled binary
Browse files Browse the repository at this point in the history
ensure existing Centmin Mod installs with older axel versions via YUM packages get removed so can install axel via source compile
  • Loading branch information
centminmod committed Jan 13, 2016
1 parent 0fff81d commit 199f346
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions inc/apcreinstall.inc
Expand Up @@ -53,6 +53,8 @@ fi

PHPCURRENTVER=$(php -v | awk -F " " '{print $2}' | head -n1 | cut -d . -f1,2)

axelsetup

if [[ "$PHPCURRENTVER" = '5.5' || "$PHPCURRENTVER" = '5.6' || "$PHPCURRENTVER" = '5.7' ]]; then
apcdevfix
else
Expand Down
6 changes: 6 additions & 0 deletions inc/axelsetup.inc
Expand Up @@ -43,6 +43,12 @@ axelsetup() {
if [[ ! -z "$(rpm -ql axel)" ]]; then
yum -q -y remove axel
fi
elif [[ "$INITIALINSTALL" != [yY] ]]; then
# remove any yum installed axel packages
# in favour of source compiled package
if [[ ! -z "$(rpm -ql axel)" ]]; then
yum -q -y remove axel
fi
fi

if [ ! -f /usr/bin/axel ]; then
Expand Down
1 change: 1 addition & 0 deletions inc/downloads.inc
Expand Up @@ -2839,6 +2839,7 @@ if [[ "$FAILEPEL" != 'y' || "$FAILRPMFORGE" != 'y' || "$FAILCENTALT" != 'y' ]];
ccachetarball
ccacheinstall

axelsetup
nginxtarball

if [[ "$PARALLEL_MODE" = [yY] ]] && [[ "$(grep "processor" /proc/cpuinfo |wc -l)" -gt '1' ]]; then
Expand Down
2 changes: 2 additions & 0 deletions inc/igbinary.inc
@@ -1,5 +1,7 @@
function funct_igbinaryinstall {

axelsetup

if [ "$IGBINARY_INSTALL" == 'y' ]; then
if [ "$IGBINARYGIT" == 'y' ]; then
cd $DIR_TMP
Expand Down
1 change: 1 addition & 0 deletions inc/nginx_upgrade.inc
Expand Up @@ -125,6 +125,7 @@ fi
}
checknginxmodules() {
axelsetup
if [[ "$NGINX_RTMP" = [yY] ]]; then
if [[ ! -d "${DIR_TMP}/nginx-rtmp-module" ]]; then
Expand Down
1 change: 1 addition & 0 deletions inc/nsd_reinstall.inc
@@ -1,4 +1,5 @@
nsdreinstall() {
axelsetup

echo "*************************************************"
cecho "* Re-Installing NSD" $boldgreen
Expand Down
1 change: 1 addition & 0 deletions inc/php_upgrade.inc
Expand Up @@ -161,6 +161,7 @@ done

########################################################################
funct_phpupgrade() {
axelsetup

if [ ${MACHINE_TYPE} == 'x86_64' ];
then
Expand Down
1 change: 1 addition & 0 deletions inc/zendopcache_reinstall.inc
@@ -1,5 +1,6 @@
#################
zopcachereinstall() {
axelsetup

if [[ -f ${CONFIGSCANDIR}/xcache.ini ]]; then
echo ""
Expand Down

0 comments on commit 199f346

Please sign in to comment.