From 113ce59555887cae516f0c98d58f388b4781324c Mon Sep 17 00:00:00 2001
From: Javernaut <javernaut@gmail.com>
Date: Tue, 21 Apr 2020 12:27:43 +0300
Subject: [PATCH] Improving the tar archive download function

---
 scripts/common-functions.sh    | 19 +++++++++++--------
 scripts/libdav1d/download.sh   |  5 ++---
 scripts/libmp3lame/download.sh | 18 ++++--------------
 scripts/parse-arguments.sh     |  2 +-
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/scripts/common-functions.sh b/scripts/common-functions.sh
index 82062c2..44aac2e 100755
--- a/scripts/common-functions.sh
+++ b/scripts/common-functions.sh
@@ -1,22 +1,25 @@
 #!/usr/bin/env bash
 
 # Function that downloads an archive with the source code by the given url,
-# extracts its files and exports a variable SOURCES_DIR_lib${LIBRARY_NAME}
-function downloadArchive() {
+# extracts its files and exports a variable SOURCES_DIR_${LIBRARY_NAME}
+function downloadTarArchive() {
+  # The full name of the library
   LIBRARY_NAME=$1
-  LIBRARY_VERSION=$2
-  DOWNLOAD_URL=$3
+  # The url of the source code archive
+  DOWNLOAD_URL=$2
 
-  echo "Ensuring sources of $LIBRARY_NAME $LIBRARY_VERSION"
-  LIBRARY_SOURCES=${LIBRARY_NAME}-${LIBRARY_VERSION}
+  ARCHIVE_NAME=${DOWNLOAD_URL##*/}
+  # Name of the directory after the archive extraction
+  LIBRARY_SOURCES="${ARCHIVE_NAME%.tar.*}"
+
+  echo "Ensuring sources of $LIBRARY_SOURCES"
 
   if [[ ! -d "$LIBRARY_SOURCES" ]]; then
     curl -O ${DOWNLOAD_URL}
 
-    ARCHIVE_NAME=${DOWNLOAD_URL##*/}
     tar xf ${ARCHIVE_NAME} -C .
     rm ${ARCHIVE_NAME}
   fi
 
-  export SOURCES_DIR_lib${LIBRARY_NAME}=$(pwd)/${LIBRARY_SOURCES}
+  export SOURCES_DIR_${LIBRARY_NAME}=$(pwd)/${LIBRARY_SOURCES}
 }
diff --git a/scripts/libdav1d/download.sh b/scripts/libdav1d/download.sh
index acd83a8..9697551 100755
--- a/scripts/libdav1d/download.sh
+++ b/scripts/libdav1d/download.sh
@@ -4,7 +4,6 @@ source ${SCRIPTS_DIR}/common-functions.sh
 
 DAV1D_VERSION=0.6.0
 
-downloadArchive \
-  "dav1d" \
-  ${DAV1D_VERSION} \
+downloadTarArchive \
+  "libdav1d" \
   "https://code.videolan.org/videolan/dav1d/-/archive/${DAV1D_VERSION}/dav1d-${DAV1D_VERSION}.tar.gz"
diff --git a/scripts/libmp3lame/download.sh b/scripts/libmp3lame/download.sh
index 46cf5d6..fe58d48 100755
--- a/scripts/libmp3lame/download.sh
+++ b/scripts/libmp3lame/download.sh
@@ -1,19 +1,9 @@
 #!/usr/bin/env bash
 
-# Script to download Lame's source code
-
-# Exports SOURCES_DIR_libmp3lame - path where actual sources are stored
+source ${SCRIPTS_DIR}/common-functions.sh
 
 LAME_VERSION=3.100
-echo "Using libmp3lame $LAME_VERSION"
-LAME_SOURCES=lame-${LAME_VERSION}
-
-if [[ ! -d "$LAME_SOURCES" ]]; then
-  TARGET_FILE_NAME=lame-${LAME_VERSION}.tar.gz
-
-  curl http://downloads.videolan.org/pub/contrib/lame/${TARGET_FILE_NAME} --output ${TARGET_FILE_NAME}
-  tar xf ${TARGET_FILE_NAME} -C .
-  rm ${TARGET_FILE_NAME}
-fi
 
-export SOURCES_DIR_libmp3lame=$(pwd)/${LAME_SOURCES}
+downloadTarArchive \
+  "libmp3lame" \
+  "http://downloads.videolan.org/pub/contrib/lame/lame-${LAME_VERSION}.tar.gz"
diff --git a/scripts/parse-arguments.sh b/scripts/parse-arguments.sh
index ea9f989..8ba04fd 100755
--- a/scripts/parse-arguments.sh
+++ b/scripts/parse-arguments.sh
@@ -73,7 +73,7 @@ for argument in "$@"; do
     --enable-libdav1d|-dav1d)
       EXTERNAL_LIBRARIES+=( "libdav1d" )
     ;;
-    --enable-libmp3lame|-mp3lame)
+    --enable-libmp3lame|-mp3lame|-lame)
       EXTERNAL_LIBRARIES+=( "libmp3lame" )
     ;;
     *)