Reuse the same tarball download for all distrho-ports builds

build-plugins.sh

@@ -99,8 +99,9 @@ for plugin in ${@}; do
     buildargs=$(echo -e $(jq -ecrM .buildargs ${pfile} || echo '\n\n') | tail -n 1)
     dlext=$(echo -e $(jq -ecrM .dlext ${pfile} || echo '\n\n') | tail -n 1)
     dlmethod=$(echo -e $(jq -ecrM .dlmethod ${pfile} || echo '\n\n') | tail -n 1)
+    dlname=$(echo -e $(jq -ecrM .dlname ${pfile} || echo '\n\n') | tail -n 1)
 
-    download "${name}" "${version}" "${dlbaseurl}" "${dlext}" "${dlmethod}"
+    download "${name}" "${version}" "${dlbaseurl}" "${dlext}" "${dlmethod}" "${dlname}"
 
     case ${buildtype} in
         "autoconf")

plugins/distrho-ports-arctican.json

@@ -8,6 +8,7 @@
     "description": "Open-source audio plugins from Arctican",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=arctican-function,arctican-pilgrim"
 }

plugins/distrho-ports-dexed.json

@@ -7,6 +7,7 @@
     "description": "Recreation of Yamaha DX7",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=dexed"
 }

plugins/distrho-ports-drowaudio.json

@@ -11,6 +11,7 @@
     "description": "Open-source audio plugins from David Rowland",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=drowaudio-distortion,drowaudio-distortionshaper,drowaudio-flanger,drowaudio-reverb,drowaudio-tremolo"
 }

plugins/distrho-ports-klangfalter.json

@@ -7,6 +7,7 @@
     "description": "Convolution reverb",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=klangfalter"
 }

plugins/distrho-ports-luftikus.json

@@ -7,6 +7,7 @@
     "description": "Digital adaptation of an analog EQ with fixed half-octave bands and additional high frequency boost",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=luftikus"
 }

plugins/distrho-ports-obxd.json

@@ -7,6 +7,7 @@
     "description": "Recreation of Oberheim OB-X",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=obxd"
 }

plugins/distrho-ports-pitched-delay.json

@@ -7,6 +7,7 @@
     "description": "Delay that allows pitching the delayed signal within or outside the feedback loop",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=pitchedDelay"
 }

plugins/distrho-ports-refine.json

@@ -7,6 +7,7 @@
     "description": "Final polishing through subtle additions in warmth, space and punch",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=refine"
 }

plugins/distrho-ports-tal-plugins.json

@@ -14,6 +14,7 @@
     "description": "Open-source audio plugins from Togu Audio Line",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=tal-dub-3,tal-filter,tal-filter-2,tal-noisemaker,tal-reverb,tal-reverb-2,tal-reverb-3,tal-vocoder-2"
 }

plugins/distrho-ports-temper.json

@@ -7,6 +7,7 @@
     "description": "Modern digital distortion",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=temper"
 }

plugins/distrho-ports-vex.json

@@ -7,6 +7,7 @@
     "description": "Wavetable polyphonic synth",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=vex"
 }

plugins/distrho-ports-wolpertinger.json

@@ -7,6 +7,7 @@
     "description": "Subtractive, antialiased polyphonic software synth",
     "dlbaseurl": "https://github.com/DISTRHO/DISTRHO-Ports.git",
     "dlmethod": "git",
+    "dlname": "distrho-ports",
     "buildtype": "meson",
     "buildargs": "-Dbuild-vst2=false -Dbuild-vst3=false -Dbuild-legacy-only=true -Dplugins=wolpertinger"
 }

setup/functions.sh

@@ -8,22 +8,26 @@ function download() {
     local dlbaseurl="${3}"
     local dlext="${4}"
     local dlmethod="${5}"
+    local dlname="${6}"
 
     if [ -z "${dlext}" ]; then
         dlext="tar.gz"
     fi
+    if [ -z "${dlname}" ]; then
+        dlname="${name}"
+    fi
 
-    local dlfile="${PAWPAW_DOWNLOADDIR}/${name}-${version}.${dlext}"
+    local dlfile="${PAWPAW_DOWNLOADDIR}/${dlname}-${version}.${dlext}"
     local dlfolder="${PAWPAW_BUILDDIR}/${name}-${version}"
 
     if [ ! -f "${dlfile}" ]; then
         if [ -n "${dlmethod}" ] && [ "${dlmethod}" = "git" ]; then
-            local tmprepodir="${PAWPAW_TMPDIR}/${name}-${version}"
+            local tmprepodir="${PAWPAW_TMPDIR}/${dlname}-${version}"
             rm -rf "${tmprepodir}"
             git clone --recursive "${dlbaseurl}" "${tmprepodir}"
             git -C "${tmprepodir}" checkout "${version}"
             git -C "${tmprepodir}" submodule update
-            tar --exclude=".git" -czf "${dlfile}" -C "${PAWPAW_TMPDIR}" "${name}-${version}"
+            tar --exclude=".git" -czf "${dlfile}" -C "${PAWPAW_TMPDIR}" "${dlname}-${version}"
             rm -rf "${tmprepodir}"
         else
             local dlurl
@@ -34,9 +38,9 @@ function download() {
                     dlurl="${dlbaseurl}/v${version}.${dlext}"
                 fi
             elif [ "${dlext}" = "orig.tar.gz" ]; then
-                dlurl="${dlbaseurl}/${name}_${version}.${dlext}"
+                dlurl="${dlbaseurl}/${dlname}_${version}.${dlext}"
             else
-                dlurl="${dlbaseurl}/${name}-${version}.${dlext}"
+                dlurl="${dlbaseurl}/${dlname}-${version}.${dlext}"
             fi
             curl -L "${dlurl}" -o "${dlfile}" --fail
         fi