From 1e2e9a32a770b3e333e01899e8115a12510a9e9b Mon Sep 17 00:00:00 2001
From: Luca <51792528+donluca@users.noreply.github.com>
Date: Sun, 2 Apr 2023 22:11:42 +0200
Subject: [PATCH] Reverted to an older approach

Reverted code to an older approach and made the target directory more visible
---
 getsysex.sh | 75 +++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/getsysex.sh b/getsysex.sh
index fab818d..50a409c 100755
--- a/getsysex.sh
+++ b/getsysex.sh
@@ -6,39 +6,43 @@
 CURL_OPTIONS="-L --connect-timeout 15 --max-time 120 --retry 3 --retry-delay 5 --show-error"
 ALLOW_INSECURE_SSL="true"
 
+TARGET_DIR="sysex/voice/"
+
 # Add here the links you wish to download from, at the bottom of the list
+# First put the link to the SysEx file you wish to download, followed by a space and then the filename on Minidexed
+# Please note that files on Minidexed need to start with a number, in this case the next link should be 000028_something.syx
 LINKS=()
-LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom1a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom1b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom2a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom2b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc101a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc101b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc102a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc102b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc103a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc103b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc104a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc104b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc105a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc105b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc106a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc106b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc107a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc107b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc108a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc108b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc109a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc109b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc110a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc110b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc111a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc111b.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc112a.syx")
-LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc112b.syx")
-# LINKS+=("https://linkToWebsite.com/something.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom1a.syx 000000_rom1a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom1b.syx 000001_rom1b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom2a.syx 000002_rom2a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/factory/rom2b.syx 000003_rom2b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc101a.syx 000004_vrc101a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc101b.syx 000005_vrc101b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc102a.syx 000006_vrc102a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc102b.syx 000007_vrc102b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc103a.syx 000008_vrc103a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc103b.syx 000009_vrc103b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc104a.syx 000010_vrc104a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc104b.syx 000011_vrc104b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc105a.syx 000012_vrc105a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc105b.syx 000013_vrc105b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc106a.syx 000014_vrc106a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc106b.syx 000015_vrc106b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc107a.syx 000016_vrc107a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc107b.syx 000017_vrc107b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc108a.syx 000018_vrc108a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc108b.syx 000019_vrc108b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc109a.syx 000020_vrc109a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc109b.syx 000021_vrc109b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc110a.syx 000022_vrc110a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc110b.syx 000023_vrc110b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc111a.syx 000024_vrc111a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc111b.syx 000025_vrc111b.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc112a.syx 000026_vrc112a.syx")
+LINKS+=("https://yamahablackboxes.com/patches/dx7/vrc/vrc112b.syx 000027_vrc112b.syx")
+# LINKS+=("https://linkToWebsite.com/something.syx 000028_something.syx")
 
-mkdir -p sysex/voice/
+mkdir -p "$TARGET_DIR"
 
 # Check internet connection, https and if website is up 
 curl ${CURL_OPTIONS} -s -I -X POST "https://yamahablackboxes.com" > /dev/null 2>&1
@@ -61,17 +65,14 @@ case $? in
 esac
 
 # Download all the files in the list
-declare -i count
 for i in "${LINKS[@]}"; 
 do
-    printf -v j "%06d" $count
-    FILENAME="$j"_`basename "${i}"`
-    echo "Downloading ${i} ..."
-    curl -o "sysex/voice/${FILENAME}" ${CURL_OPTIONS} "${i}" > /dev/null 2>&1
+    LINK=`echo "${i}" | awk '{print $1}'`
+    FILE=`echo "${i}" | awk '{print $2}'`
+    echo "Downloading ${LINK} ..."
+    curl -o "${TARGET_DIR}${FILE}" ${CURL_OPTIONS} "${LINK}" > /dev/null 2>&1
     if (( $? > 0 ))
     then
         echo "Download failed"
-    else
-        count+=1
     fi
 done