From 8378fcc076b44e46203e9fc1a50d57bac73a1d8c Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 6 Mar 2020 21:17:06 +0100
Subject: Partial rewrite of build process

Switching to an Arch based build process for easier maintenance and
using specific runners for tasks where that might be necessary.

Right now, parent/child pipelines for somewhat parallel builds for
different architectures / semi-independent pak-builds don't seem to
properly work yet due to `trigger:` not being recognized when it should,
so that's not yet implemented.
---
 binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'binary_tarball/scripts/5_Configure_Binary_Tarball.sh')

diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
index 0e6551e..fe4a4a6 100755
--- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
+++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
@@ -11,7 +11,7 @@ _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
-tar -xf $BINARY_TARBALL;
+tar -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER/..;
 
 # Adds the librefox config files to the packaged tarball
 printf "\nCopying librewolf settings to extracted binary tarball\n";
@@ -22,6 +22,6 @@ cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh;
 
 # Repacks the binary tarball
 printf "\nRecompressing binary tarball\n";
-tar -jvcf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER;
+tar -jvcf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .;
 
 
-- 
cgit