From ea84fbd9a7631afd6d1f374934016b282c966d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Sch=C3=B6nauer?=
 <37108907+DottoDev@users.noreply.github.com>
Date: Sun, 23 Oct 2022 17:46:45 +0000
Subject: [PATCH] Build script improvements (#67)

---
 build-all.sh | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/build-all.sh b/build-all.sh
index adfe7e99..958cf6f2 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -4,22 +4,61 @@ build_function() {
     cargo install cross
 
 
+    echo -n "Building x86_64-linux-gnu"
     cross build --release --target x86_64-unknown-linux-gnu
+    echo -n "Building x86_64-linux-musl"
     cross build --release --target x86_64-unknown-linux-musl
+    echo -n "Building x86_64-freebsd"
     cross build --release --target x86_64-unknown-freebsd
+    echo -n "Building aarch64-linux-gnu"
     cross build --release --target aarch64-unknown-linux-gnu
+    echo -n "Building aarch64-linux-musl"
     cross build --release --target aarch64-unknown-linux-musl
+    echo -n "Building x86_64-windows-gnu"
     cross build --release --target x86_64-pc-windows-gnu
 }
 
 package_function() {
-    tar -czvf build/topgrade-${ans}-x86_64-linux-gnu.tar.gz target/x86_64-unknown-linux-gnu/release/topgrade
-    tar -czvf build/topgrade-${ans}-x86_64-linux-musl.tar.gz target/x86_64-unknown-linux-musl/release/topgrade
-    tar -czvf build/topgrade-${ans}-x86_64-freebsd.tar.gz target/x86_64-unknown-freebsd/release/topgrade
-    tar -czvf build/topgrade-${ans}-aarch64-linux-gnu.tar.gz target/aarch64-unknown-linux-gnu/release/topgrade
-    tar -czvf build/topgrade-${ans}-aarch64-linux-musl.tar.gz target/aarch64-unknown-linux-musl/release/topgrade
-    zip -q build/topgrade-${ans}-x86_64-windows.zip target/x86_64-pc-windows-gnu/release/topgrade.exe
 
+    cd build
+    mkdir x86_64-unknown-linux-gnu/
+    mkdir x86_64-unknown-linux-musl/
+    mkdir x86_64-unknown-freebsd/
+    mkdir x86_64-pc-windows-gnu/
+    mkdir aarch64-unknown-linux-gnu/
+    mkdir aarch64-unknown-linux-musl/
+
+    cp ../target/x86_64-unknown-linux-gnu/release/topgrade      x86_64-unknown-linux-gnu/
+    cp ../target/x86_64-unknown-linux-musl/release/topgrade     x86_64-unknown-linux-musl/
+    cp ../target/x86_64-unknown-freebsd/release/topgrade        x86_64-unknown-freebsd/topgrade
+    cp ../target/aarch64-unknown-linux-gnu/release/topgrade     aarch64-unknown-linux-gnu/topgrade
+    cp ../target/aarch64-unknown-linux-musl/release/topgrade    aarch64-unknown-linux-musl/topgrade
+    cp ../target/x86_64-pc-windows-gnu/release/topgrade.exe     x86_64-pc-windows-gnu/topgrade.exe
+
+    cd x86_64-unknown-linux-gnu/
+    tar -czf ../topgrade-${ans}-x86_64-linux-gnu.tar.gz topgrade
+    cd ..
+
+    cd x86_64-unknown-linux-musl
+    tar -czf ../topgrade-${ans}-x86_64-linux-musl.tar.gz  topgrade
+    cd ..
+
+    cd x86_64-unknown-freebsd/
+    tar -czf ../topgrade-${ans}-x86_64-freebsd.tar.gz     topgrade
+    cd ..
+
+    cd aarch64-unknown-linux-gnu/
+    tar -czf ../topgrade-${ans}-aarch64-linux-gnu.tar.gz  topgrade
+    cd ..
+
+    cd aarch64-unknown-linux-musl/
+    tar -czf ../topgrade-${ans}-aarch64-linux-musl.tar.gz topgrade
+    cd ..
+
+    cd x86_64-pc-windows-gnu/
+    zip -q ../topgrade-${ans}-x86_64-windows.zip           topgrade.exe
+    cd ..
+    cd ..
 
 }