Improve the Aria2 source code download process

Author: P3TERX

aria2-gnu-linux-build-amd64.sh

@@ -9,7 +9,7 @@
 # File name: aria2-gnu-linux-build.sh
 # Description: Aria2 ard64 platform build
 # System Required: Debian & Ubuntu & Fedora & Arch Linux
-# Version: 1.5
+# Version: 1.6
 #
 
 set -e
@@ -21,6 +21,7 @@ SCRIPT_DIR=$(dirname $(readlink -f $0))
 ARCH="amd64"
 OPENSSL_ARCH="linux-x86_64"
 BUILD_DIR="/tmp"
+ARIA2_CODE_DIR="$BUILD_DIR/aria2"
 OUTPUT_DIR="$HOME/output"
 PREFIX="$BUILD_DIR/aria2-build-libs"
 ARIA2_PREFIX="/usr/local"

aria2-gnu-linux-build.sh

@@ -9,7 +9,7 @@
 # File name: aria2-gnu-linux-build.sh
 # Description: Aria2 Build on the target platforms
 # System Required: Debian & Ubuntu & Fedora & Arch Linux
-# Version: 1.5
+# Version: 1.6
 #
 
 set -e
@@ -21,6 +21,7 @@ SCRIPT_DIR=$(dirname $(readlink -f $0))
 ARCH="$(uname -m)"
 OPENSSL_ARCH="linux-elf"
 BUILD_DIR="/tmp"
+ARIA2_CODE_DIR="$BUILD_DIR/aria2"
 OUTPUT_DIR="$HOME/output"
 PREFIX="$BUILD_DIR/aria2-build-libs"
 ARIA2_PREFIX="/usr/local"

aria2-gnu-linux-cross-build-arm64.sh

@@ -9,7 +9,7 @@
 # File name: aria2-gnu-linux-cross-build-arm64.sh
 # Description: Aria2 ard64 platform cross build
 # System Required: Debian & Ubuntu & Fedora & Arch Linux
-# Version: 1.5
+# Version: 1.6
 #
 
 set -e
@@ -22,6 +22,7 @@ ARCH="arm64"
 HOST="aarch64-linux-gnu"
 OPENSSL_ARCH="linux-aarch64"
 BUILD_DIR="/tmp"
+ARIA2_CODE_DIR="$BUILD_DIR/aria2"
 OUTPUT_DIR="$HOME/output"
 PREFIX="$BUILD_DIR/aria2-cross-build-libs-$ARCH"
 ARIA2_PREFIX="$HOME/aria2-local"

aria2-gnu-linux-cross-build-armhf.sh

@@ -9,7 +9,7 @@
 # File name: aria2-gnu-linux-cross-build-armhf.sh
 # Description: Aria2 armhf platform cross build
 # System Required: Ubuntu 14.04/16.04
-# Version: 1.5
+# Version: 1.6
 #
 
 set -e
@@ -22,6 +22,7 @@ ARCH="armhf"
 HOST="arm-linux-gnueabihf"
 OPENSSL_ARCH="linux-generic32"
 BUILD_DIR="/tmp"
+ARIA2_CODE_DIR="$BUILD_DIR/aria2"
 OUTPUT_DIR="$HOME/output"
 PREFIX="$BUILD_DIR/aria2-cross-build-libs-$ARCH"
 ARIA2_PREFIX="$HOME/aria2-local"

aria2-gnu-linux-cross-build-i386.sh

@@ -9,7 +9,7 @@
 # File name: aria2-gnu-linux-cross-build-i386.sh
 # Description: Aria2 i386 platform cross build
 # System Required: Debian & Ubuntu & Fedora & Arch Linux
-# Version: 1.5
+# Version: 1.6
 #
 
 set -e
@@ -22,6 +22,7 @@ ARCH="i386"
 HOST="i686-linux-gnu"
 OPENSSL_ARCH="linux-x86"
 BUILD_DIR="/tmp"
+ARIA2_CODE_DIR="$BUILD_DIR/aria2"
 OUTPUT_DIR="$HOME/output"
 PREFIX="$BUILD_DIR/aria2-cross-build-libs-$ARCH"
 ARIA2_PREFIX="$HOME/aria2-local"

snippet/aria2-bin

@@ -9,20 +9,20 @@
 #
 
 ARIA2_BIN() {
-    cd $BUILD_DIR/aria2/src
+    cd $ARIA2_CODE_DIR/src
     $STRIP aria2c
     mkdir -p $OUTPUT_DIR
     cp aria2c $OUTPUT_DIR
 }
 
 ARIA2_PACKAGE() {
-    cd $BUILD_DIR/aria2/src
+    cd $ARIA2_CODE_DIR/src
     $STRIP aria2c
     mkdir -p $OUTPUT_DIR
     tar zcvf $OUTPUT_DIR/aria2-static-linux-$ARCH.tar.gz aria2c
 }
 
 ARIA2_INSTALL() {
-    cd $BUILD_DIR/aria2
+    cd $ARIA2_CODE_DIR
     make install-strip
 }

snippet/aria2-code

@@ -8,20 +8,22 @@
 # File name: snippet/aria2-code
 #
 
-ARIA2_SOURCE() {
-    if [ -e $BUILD_DIR/aria2 ]; then
-        cd $BUILD_DIR/aria2
+ARIA2_GIT_CODE() {
+    if [[ -d $ARIA2_CODE_DIR && -d $ARIA2_CODE_DIR/.git ]]; then
+        cd $ARIA2_CODE_DIR
+        git checkout master || git checkout HEAD
         git reset --hard origin || git reset --hard
         git pull
     else
-        git clone https://github.com/aria2/aria2 $BUILD_DIR/aria2
-        cd $BUILD_DIR/aria2
+        rm -rf $ARIA2_CODE_DIR
+        git clone https://github.com/aria2/aria2 $ARIA2_CODE_DIR
+        cd $ARIA2_CODE_DIR
     fi
-    autoreconf -i
+    autoreconf -fi || autoreconf -fiv
 }
 
-ARIA2_RELEASE() {
-    mkdir -p $BUILD_DIR/aria2 && cd $BUILD_DIR/aria2
+ARIA2_RELEASE_CODE() {
+    mkdir -p $ARIA2_CODE_DIR && cd $ARIA2_CODE_DIR
     curl -s 'https://api.github.com/repos/aria2/aria2/releases/latest' |
         grep 'browser_download_url.*[0-9]\.tar\.xz' | sed -e 's/^[[:space:]]*//' |
         cut -d ' ' -f 2 | xargs -I % curl -Ls -o - '%' | tar Jxvf - --strip-components=1
@@ -30,3 +32,9 @@ ARIA2_RELEASE() {
 ARIA2_PATCH() {
     git apply $SCRIPT_DIR/patch/*.patch
 }
+
+ARIA2_CODE_GET() {
+    #ARIA2_RELEASE_CODE
+    ARIA2_GIT_CODE
+    ARIA2_PATCH
+}

snippet/clean

@@ -17,7 +17,7 @@ CLEANUP_SRC() {
         openssl \
         sqlite3 \
         libssh2 \
-        aria2
+        $ARIA2_CODE_DIR
 }
 
 CLEANUP_LIB() {

snippet/cross-build

@@ -94,8 +94,7 @@ JEMALLOC_BUILD() {
 }
 
 ARIA2_BUILD() {
-    ARIA2_RELEASE || ARIA2_SOURCE
-    ARIA2_PATCH
+    ARIA2_CODE_GET
     ./configure \
         --host=$HOST \
         --prefix=${ARIA2_PREFIX:-'/usr/loacl'} \

snippet/target-build

@@ -85,8 +85,7 @@ JEMALLOC_BUILD() {
 }
 
 ARIA2_BUILD() {
-    ARIA2_RELEASE || ARIA2_SOURCE
-    ARIA2_PATCH
+    ARIA2_CODE_GET
     ./configure \
         --prefix=${ARIA2_PREFIX:-'/usr/loacl'} \
         --without-libxml2 \