update axel download url, filename and fallback mirror

- Axel multithreaded download accelerator's download Github url link changed and also the download filename changed so needs updating for fresh installs - fallback local hosted centminmod.com mirror url had missing download due to incorrect filename + source download filename changed again anyway - fixes issues for fresh installs like https://community.centminmod.com/threads/error-axel-2-6-tar-gz-download-failed.12839/
centminmod · Sep 12, 2017 · d9c2dac · d9c2dac
1 parent 768d859
commit d9c2dac
Show file tree

Hide file tree

Showing 22 changed files with 304 additions and 304 deletions.
diff --git a/centmin.sh b/centmin.sh
@@ -602,7 +602,7 @@ SIEGE_VERSION='4.0.2'
 
 CURL_TIMEOUTS=' --max-time 5 --connect-timeout 5'
 WGETOPT='-cnv --no-dns-cache -4'
-AXEL_VER='2.6'               # Axel source compile version https://github.com/eribertomota/axel/releases
+AXEL_VER='2.6'               # Axel source compile version https://github.com/axel-download-accelerator/axel/releases
 ###############################################################
 # experimental Intel compiled optimisations 
 # when auto detect Intel based processors
@@ -684,7 +684,7 @@ else
 fi
 
 if [[ "$CENTOS_SEVEN" = '7' ]]; then
-  AXEL_VER='2.12'
+  AXEL_VER='2.14'
 fi
 
 # ensure clang alternative to gcc compiler is used only for 64bit OS

diff --git a/inc/axelsetup.inc b/inc/axelsetup.inc
@@ -48,37 +48,37 @@ return
 	cd $DIR_TMP
 
         if [[ "$AXELVERBOSE" != 'silent' ]]; then
-          cecho "Download $AXEK_LINKFILE ..." $boldyellow
+          cecho "Download $AXEL_LINKFILE ..." $boldyellow
         fi
-    if [ -s $AXEK_LINKFILE ]; then
+    if [ -s $AXEL_LINKFILE ]; then
         cecho "Axel ${AXEL_VER} Archive found, skipping download..." $boldgreen 
     else
-        wget -O $AXEK_LINKFILE $AXEK_LINK
+        wget -O $AXEL_LINKFILE $AXEL_LINK
 ERROR=$?
     if [[ "$ERROR" != '0' ]]; then
-    cecho "Error: $AXEK_LINKFILE download failed." $boldgreen
+    cecho "Error: $AXEL_LINKFILE download failed." $boldgreen
 checklogdetails
     exit #$ERROR
 else 
-         cecho "Download $AXEK_LINKFILE done." $boldyellow
+         cecho "Download $AXEL_LINKFILE done." $boldyellow
 #echo ""
     fi
     fi
 
 if [[ "$(tar -tzf axel-${AXEL_VER}.tar.gz >/dev/null; echo $?)" != '0' ]]; then
   rm -rf /svr-setup/axel-${AXEL_VER}.*
   echo "re-try download form local mirror..."
-  wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+  wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
 fi
 
-tar xzf $AXEK_LINKFILE
+tar xzf $AXEL_LINKFILE
 ERROR=$?
     if [[ "$ERROR" != '0' ]]; then
-    cecho "Error: $AXEK_LINKFILE extraction failed." $boldgreen
+    cecho "Error: $AXEL_LINKFILE extraction failed." $boldgreen
 checklogdetails
     exit #$ERROR
 else 
-         cecho "$AXEK_LINKFILE valid file." $boldyellow
+         cecho "$AXEL_LINKFILE valid file." $boldyellow
 echo ""
     fi
 

diff --git a/inc/cpcheck.inc b/inc/cpcheck.inc
@@ -553,7 +553,7 @@ wgetver_check() {
 
 axelcheck() {
   if [[ -f /usr/local/bin/axel || -f /usr/bin/axel ]]; then
-  if [[ "$(axel -V | awk '/version/ {print $3}')" != "${AXEL_VER}" ]] || [[ -f /usr/local/bin/axel && ! -d "${DIR_TMP}/axel-${AXEL_VER}" && ! -f "${DIR_TMP}/${AXEK_LINKFILE}" ]]; then
+  if [[ "$(axel -V | awk '/version/ {print $3}')" != "${AXEL_VER}" ]] || [[ -f /usr/local/bin/axel && ! -d "${DIR_TMP}/axel-${AXEL_VER}" && ! -f "${DIR_TMP}/${AXEL_LINKFILE}" ]]; then
     echo "update axel version... one time task"
     sleep 3
     install_axel silent

diff --git a/inc/downloadlinks.inc b/inc/downloadlinks.inc
@@ -442,10 +442,10 @@ EZSETUPLINKFILE='ez_setup.py'
 EZSETUPLINK="https://bitbucket.org/pypa/setuptools/raw/bootstrap/${EZSETUPLINKFILE}"
 
 # wget renamed github
-AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-AXEK_LINKGITLAB="https://gitlab.com/centminmod-github-mirror/axel/repository/archive.tar.gz?ref=${AXEL_VER}"
-AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/${AXEL_VER}.tar.gz"
+AXEL_LINKGITLAB="https://gitlab.com/centminmod-github-mirror/axel/repository/archive.tar.gz?ref=${AXEL_VER}"
+AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
 
 WGET_FILENAME="wget-${WGET_VERSION}.tar.gz"
 WGET_LINK="https://centminmod.com/centminmodparts/wget/${WGET_FILENAME}"

diff --git a/installer-dnf-gitlab.sh b/installer-dnf-gitlab.sh
@@ -29,9 +29,9 @@ CMGIT='https://gitlab.com/centminmod/centminmod.git'
 # wget renamed github
 AXEL='n'
 AXEL_VER='2.6'
-AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/v${AXEL_VER}.tar.gz"
+AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/v${AXEL_VER}.tar.gz"
 #######################################################
 ALTPCRE_VERSION='8.41'
 ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
@@ -134,10 +134,10 @@ else
 fi
 
 if [[ "$CENTOS_SEVEN" = '7' ]]; then
-  AXEL_VER='2.12'
-  AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-  AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-  AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+  AXEL_VER='2.14'
+  AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+  AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/${AXEL_VER}.tar.gz"
+  AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
 fi
 
 if [ -f /etc/centminmod/custom_config.inc ]; then
@@ -974,32 +974,32 @@ yumupdater() {
 
 install_axel() {
   cd $DIR_TMP
-  echo "Download $AXEK_LINKFILE ..."
-  if [ -s $AXEK_LINKFILE ]; then
+  echo "Download $AXEL_LINKFILE ..."
+  if [ -s $AXEL_LINKFILE ]; then
     echo "Axel ${AXEL_VER} Archive found, skipping download..." 
   else
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
     ERROR=$?
     if [[ "$ERROR" != '0' ]]; then
-     echo "Error: $AXEK_LINKFILE download failed."
+     echo "Error: $AXEL_LINKFILE download failed."
       exit #$ERROR
     else 
-      echo "Download $AXEK_LINKFILE done."
+      echo "Download $AXEL_LINKFILE done."
     fi
   fi
 
   if [[ "$(tar -tzf axel-${AXEL_VER}.tar.gz >/dev/null; echo $?)" != '0' ]]; then
     rm -rf /svr-setup/axel-${AXEL_VER}.*
     echo "re-try download form local mirror..."
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
   fi
-  tar xzf $AXEK_LINKFILE
+  tar xzf $AXEL_LINKFILE
   ERROR=$?
   if [[ "$ERROR" != '0' ]]; then
-    echo "Error: $AXEK_LINKFILE extraction failed."
+    echo "Error: $AXEL_LINKFILE extraction failed."
     exit #$ERROR
   else 
-    echo "$AXEK_LINKFILE valid file."
+    echo "$AXEL_LINKFILE valid file."
     echo ""
   fi
 

diff --git a/installer-dnf.sh b/installer-dnf.sh
@@ -29,9 +29,9 @@ CMGIT='https://github.com/centminmod/centminmod.git'
 # wget renamed github
 AXEL='n'
 AXEL_VER='2.6'
-AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/v${AXEL_VER}.tar.gz"
+AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/v${AXEL_VER}.tar.gz"
 #######################################################
 ALTPCRE_VERSION='8.41'
 ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
@@ -134,10 +134,10 @@ else
 fi
 
 if [[ "$CENTOS_SEVEN" = '7' ]]; then
-  AXEL_VER='2.12'
-  AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-  AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-  AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+  AXEL_VER='2.14'
+  AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+  AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/${AXEL_VER}.tar.gz"
+  AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
 fi
 
 if [ -f /etc/centminmod/custom_config.inc ]; then
@@ -974,31 +974,31 @@ yumupdater() {
 
 install_axel() {
   cd $DIR_TMP
-  echo "Download $AXEK_LINKFILE ..."
-  if [ -s $AXEK_LINKFILE ]; then
+  echo "Download $AXEL_LINKFILE ..."
+  if [ -s $AXEL_LINKFILE ]; then
     echo "Axel ${AXEL_VER} Archive found, skipping download..." 
   else
-    wget -O $AXEK_LINKFILE $AXEK_LINK
+    wget -O $AXEL_LINKFILE $AXEL_LINK
     ERROR=$?
     if [[ "$ERROR" != '0' ]]; then
-     echo "Error: $AXEK_LINKFILE download failed."
+     echo "Error: $AXEL_LINKFILE download failed."
       exit #$ERROR
     else 
-      echo "Download $AXEK_LINKFILE done."
+      echo "Download $AXEL_LINKFILE done."
     fi
   fi
   if [[ "$(tar -tzf axel-${AXEL_VER}.tar.gz >/dev/null; echo $?)" != '0' ]]; then
     rm -rf /svr-setup/axel-${AXEL_VER}.*
     echo "re-try download form local mirror..."
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
   fi
-  tar xzf $AXEK_LINKFILE
+  tar xzf $AXEL_LINKFILE
   ERROR=$?
   if [[ "$ERROR" != '0' ]]; then
-    echo "Error: $AXEK_LINKFILE extraction failed."
+    echo "Error: $AXEL_LINKFILE extraction failed."
     exit #$ERROR
   else 
-    echo "$AXEK_LINKFILE valid file."
+    echo "$AXEL_LINKFILE valid file."
     echo ""
   fi
 

diff --git a/installer-gitlab.sh b/installer-gitlab.sh
@@ -29,9 +29,9 @@ CMGIT='https://gitlab.com/centminmod/centminmod.git'
 # wget renamed github
 AXEL='n'
 AXEL_VER='2.6'
-AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/v${AXEL_VER}.tar.gz"
+AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/v${AXEL_VER}.tar.gz"
 #######################################################
 ALTPCRE_VERSION='8.41'
 ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
@@ -134,10 +134,10 @@ else
 fi
 
 if [[ "$CENTOS_SEVEN" = '7' ]]; then
-  AXEL_VER='2.12'
-  AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-  AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-  AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+  AXEL_VER='2.14'
+  AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+  AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/${AXEL_VER}.tar.gz"
+  AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
 fi
 
 if [ -f /etc/centminmod/custom_config.inc ]; then
@@ -974,32 +974,32 @@ yumupdater() {
 
 install_axel() {
   cd $DIR_TMP
-  echo "Download $AXEK_LINKFILE ..."
-  if [ -s $AXEK_LINKFILE ]; then
+  echo "Download $AXEL_LINKFILE ..."
+  if [ -s $AXEL_LINKFILE ]; then
     echo "Axel ${AXEL_VER} Archive found, skipping download..." 
   else
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
     ERROR=$?
     if [[ "$ERROR" != '0' ]]; then
-     echo "Error: $AXEK_LINKFILE download failed."
+     echo "Error: $AXEL_LINKFILE download failed."
       exit #$ERROR
     else 
-      echo "Download $AXEK_LINKFILE done."
+      echo "Download $AXEL_LINKFILE done."
     fi
   fi
 
   if [[ "$(tar -tzf axel-${AXEL_VER}.tar.gz >/dev/null; echo $?)" != '0' ]]; then
     rm -rf /svr-setup/axel-${AXEL_VER}.*
     echo "re-try download form local mirror..."
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
   fi
-  tar xzf $AXEK_LINKFILE
+  tar xzf $AXEL_LINKFILE
   ERROR=$?
   if [[ "$ERROR" != '0' ]]; then
-    echo "Error: $AXEK_LINKFILE extraction failed."
+    echo "Error: $AXEL_LINKFILE extraction failed."
     exit #$ERROR
   else 
-    echo "$AXEK_LINKFILE valid file."
+    echo "$AXEL_LINKFILE valid file."
     echo ""
   fi
 

diff --git a/installer-latest-gitlab.sh b/installer-latest-gitlab.sh
@@ -29,9 +29,9 @@ CMGIT='https://gitlab.com/centminmod/centminmod.git'
 # wget renamed github
 AXEL='n'
 AXEL_VER='2.6'
-AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/v${AXEL_VER}.tar.gz"
+AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/v${AXEL_VER}.tar.gz"
 #######################################################
 ALTPCRE_VERSION='8.41'
 ALTPCRELINKFILE="pcre-${ALTPCRE_VERSION}.tar.gz"
@@ -134,10 +134,10 @@ else
 fi
 
 if [[ "$CENTOS_SEVEN" = '7' ]]; then
-  AXEL_VER='2.12'
-  AXEK_LINKFILE="axel-${AXEL_VER}.tar.gz"
-  AXEK_LINK="https://github.com/eribertomota/axel/archive/${AXEL_VER}.tar.gz"
-  AXEK_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
+  AXEL_VER='2.14'
+  AXEL_LINKFILE="axel-${AXEL_VER}.tar.gz"
+  AXEL_LINK="https://github.com/axel-download-accelerator/axel/archive/${AXEL_VER}.tar.gz"
+  AXEL_LINKLOCAL="${LOCALCENTMINMOD_MIRROR}/centminmodparts/axel/${AXEL_VER}.tar.gz"
 fi
 
 if [ -f /etc/centminmod/custom_config.inc ]; then
@@ -980,31 +980,31 @@ yumupdater() {
 
 install_axel() {
   cd $DIR_TMP
-  echo "Download $AXEK_LINKFILE ..."
-  if [ -s $AXEK_LINKFILE ]; then
+  echo "Download $AXEL_LINKFILE ..."
+  if [ -s $AXEL_LINKFILE ]; then
     echo "Axel ${AXEL_VER} Archive found, skipping download..." 
   else
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
     ERROR=$?
     if [[ "$ERROR" != '0' ]]; then
-     echo "Error: $AXEK_LINKFILE download failed."
+     echo "Error: $AXEL_LINKFILE download failed."
       exit #$ERROR
     else 
-      echo "Download $AXEK_LINKFILE done."
+      echo "Download $AXEL_LINKFILE done."
     fi
   fi
   if [[ "$(tar -tzf axel-${AXEL_VER}.tar.gz >/dev/null; echo $?)" != '0' ]]; then
     rm -rf /svr-setup/axel-${AXEL_VER}.*
     echo "re-try download form local mirror..."
-    wget -O $AXEK_LINKFILE $AXEK_LINKLOCAL
+    wget -O $AXEL_LINKFILE $AXEL_LINKLOCAL
   fi
-  tar xzf $AXEK_LINKFILE
+  tar xzf $AXEL_LINKFILE
   ERROR=$?
   if [[ "$ERROR" != '0' ]]; then
-    echo "Error: $AXEK_LINKFILE extraction failed."
+    echo "Error: $AXEL_LINKFILE extraction failed."
     exit #$ERROR
   else 
-    echo "$AXEK_LINKFILE valid file."
+    echo "$AXEL_LINKFILE valid file."
     echo ""
   fi