From 90c6b5681403ff92440a7cfa2764ae8955762910 Mon Sep 17 00:00:00 2001
From: Mason Rowe <mason@rowe.sh>
Date: Mon, 29 Nov 2021 23:56:04 -0500
Subject: [PATCH] reorganized pre-compiled binaries

---
 bin/README.md                  |  23 +++++++++++------------
 bin/{ => fio}/fio_aarch64      | Bin
 bin/{ => fio}/fio_arm          | Bin
 bin/{ => fio}/fio_x64          | Bin
 bin/{ => fio}/fio_x86          | Bin
 bin/{ => iperf}/iperf3_aarch64 | Bin
 bin/{ => iperf}/iperf3_arm     | Bin
 bin/{ => iperf}/iperf3_x64     | Bin
 bin/{ => iperf}/iperf3_x86     | Bin
 yabs.sh                        |   8 ++++----
 10 files changed, 15 insertions(+), 16 deletions(-)
 rename bin/{ => fio}/fio_aarch64 (100%)
 rename bin/{ => fio}/fio_arm (100%)
 rename bin/{ => fio}/fio_x64 (100%)
 rename bin/{ => fio}/fio_x86 (100%)
 rename bin/{ => iperf}/iperf3_aarch64 (100%)
 rename bin/{ => iperf}/iperf3_arm (100%)
 rename bin/{ => iperf}/iperf3_x64 (100%)
 rename bin/{ => iperf}/iperf3_x86 (100%)

diff --git a/bin/README.md b/bin/README.md
index d355c8a..9f0042f 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -4,19 +4,18 @@ This directory contains all of the binaries required to run the benchmarking tes
 
 ### Binaries
 
-* **fio_x64** - v3.27 (compiled 28 May 2021) - 64-bit version
-* **fio_x86** - v3.27 (compiled 28 May 2021) - 32-bit version
-* **iperf_x64** - v3.10 (compiled 28 May 2021) - 64-bit version
-* **iperf_x86** - v3.10 (compiled 28 May 2021) - 32-bit version
+| Binary Name | Version | Compiled Date | Architecture | OS |
+|:-:|:-:|:-:|:-:|:-:|
+| fio_x64 | 3.27 | 28-MAY-2021 | x86_64 | 64-bit |
+| fio_x86 | 3.27 |  28-MAY-2021 | x86 | 32-bit |
+| fio_aarch64 | 3.27 | 05-JUN-2021 | ARM | 64-bit |
+| fio_arm | 3.27 | 05-JUN-2021 | ARM | 32-bit |
+| iperf_x64 | 3.10 | 28-MAY-2021 | x86_64 | 64-bit |
+| iperf_x86 | 3.10 |  28-MAY-2021 | x86 | 32-bit |
+| iperf_aarch64 | 3.10 | 05-JUN-2021 | ARM | 64-bit |
+| iperf_arm | 3.10 | 05-JUN-2021 | ARM | 32-bit |
 
-### ARM Binaries
-
-ARM compatibilty is considered experimental. Static binaries for ARM-based machines are cross-compiled within a Holy Build Box container using the [musl toolchain](https://musl.cc/).
-
-* **fio_aarch64** - v3.27 (compiled 05 June 2021) - ARM 64-bit version
-* **fio_arm** - v3.27 (compiled 05 June 2021) - ARM 32-bit version
-* **iperf_aarch64** - v3.10 (compiled 05 June 2021) - ARM 64-bit version
-* **iperf_arm** - v3.10 (compiled 05 June 2021) - ARM 32-bit version
+Note: ARM compatibilty is considered experimental. Static binaries for ARM-based machines are cross-compiled within a Holy Build Box container using the [musl toolchain](https://musl.cc/).
 
 ### Compile Notes
 
diff --git a/bin/fio_aarch64 b/bin/fio/fio_aarch64
similarity index 100%
rename from bin/fio_aarch64
rename to bin/fio/fio_aarch64
diff --git a/bin/fio_arm b/bin/fio/fio_arm
similarity index 100%
rename from bin/fio_arm
rename to bin/fio/fio_arm
diff --git a/bin/fio_x64 b/bin/fio/fio_x64
similarity index 100%
rename from bin/fio_x64
rename to bin/fio/fio_x64
diff --git a/bin/fio_x86 b/bin/fio/fio_x86
similarity index 100%
rename from bin/fio_x86
rename to bin/fio/fio_x86
diff --git a/bin/iperf3_aarch64 b/bin/iperf/iperf3_aarch64
similarity index 100%
rename from bin/iperf3_aarch64
rename to bin/iperf/iperf3_aarch64
diff --git a/bin/iperf3_arm b/bin/iperf/iperf3_arm
similarity index 100%
rename from bin/iperf3_arm
rename to bin/iperf/iperf3_arm
diff --git a/bin/iperf3_x64 b/bin/iperf/iperf3_x64
similarity index 100%
rename from bin/iperf3_x64
rename to bin/iperf/iperf3_x64
diff --git a/bin/iperf3_x86 b/bin/iperf/iperf3_x86
similarity index 100%
rename from bin/iperf3_x86
rename to bin/iperf/iperf3_x86
diff --git a/yabs.sh b/yabs.sh
index 82cef23..b01d31d 100755
--- a/yabs.sh
+++ b/yabs.sh
@@ -439,9 +439,9 @@ elif [ -z "$SKIP_FIO" ]; then
 	else
 		# download fio binary
 		if [ ! -z "$IPV4_CHECK" ]; then # if IPv4 is enabled
-			curl -s -4 --connect-timeout 5 --retry 5 --retry-delay 0 https://raw.githubusercontent.com/masonr/yet-another-bench-script/master/bin/fio_$ARCH -o $DISK_PATH/fio
+			curl -s -4 --connect-timeout 5 --retry 5 --retry-delay 0 https://raw.githubusercontent.com/masonr/yet-another-bench-script/master/bin/fio/fio_$ARCH -o $DISK_PATH/fio
 		else # no IPv4, use IPv6 - below is necessary since raw.githubusercontent.com has no AAAA record
-			curl -s -6 --connect-timeout 5 --retry 5 --retry-delay 0 -k -g --header 'Host: raw.githubusercontent.com' https://[2a04:4e42::133]/masonr/yet-another-bench-script/master/bin/fio_$ARCH -o $DISK_PATH/fio
+			curl -s -6 --connect-timeout 5 --retry 5 --retry-delay 0 -k -g --header 'Host: raw.githubusercontent.com' https://[2a04:4e42::133]/masonr/yet-another-bench-script/master/bin/fio/fio_$ARCH -o $DISK_PATH/fio
 		fi
 
 		if [ ! -f "$DISK_PATH/fio" ]; then # ensure fio binary download successfully
@@ -636,9 +636,9 @@ if [ -z "$SKIP_IPERF" ]; then
 
 		# download iperf3 binary
 		if [ ! -z "$IPV4_CHECK" ]; then # if IPv4 is enabled
-			curl -s -4 --connect-timeout 5 --retry 5 --retry-delay 0 https://raw.githubusercontent.com/masonr/yet-another-bench-script/master/bin/iperf3_$ARCH -o $IPERF_PATH/iperf3
+			curl -s -4 --connect-timeout 5 --retry 5 --retry-delay 0 https://raw.githubusercontent.com/masonr/yet-another-bench-script/master/bin/iperf/iperf3_$ARCH -o $IPERF_PATH/iperf3
 		else # no IPv4, use IPv6 - below is necessary since raw.githubusercontent.com has no AAAA record
-			curl -s -6 --connect-timeout 5 --retry 5 --retry-delay 0 -k -g --header 'Host: raw.githubusercontent.com' https://[2a04:4e42::133]/masonr/yet-another-bench-script/master/bin/iperf3_$ARCH -o $IPERF_PATH/iperf3
+			curl -s -6 --connect-timeout 5 --retry 5 --retry-delay 0 -k -g --header 'Host: raw.githubusercontent.com' https://[2a04:4e42::133]/masonr/yet-another-bench-script/master/bin/iperf/iperf3_$ARCH -o $IPERF_PATH/iperf3
 		fi
 
 		if [ ! -f "$IPERF_PATH/iperf3" ]; then # ensure iperf3 binary downloaded successfully