From 4223941028524867fc6607f8dc3c6a701f665a58 Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Mon, 30 Mar 2020 10:37:02 +0200
Subject: fix tarball / path handling in configure-tarball script

---
 binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
index c503844..2068805 100755
--- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
+++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh
@@ -15,13 +15,14 @@ _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
 
 # Extracts the binary tarball
 printf "\nExtracting librewolf binary tarball\n";
-tar -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER/..;
+mkdir -p $_EXTRACTED_TARBALL_FOLDER
+tar --strip-components=1 -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";
 
 git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings;
-# no need to keep that in there
+# no need to keep that in there:
 rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git";
 cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings;
 cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh;
@@ -49,4 +50,4 @@ END
 
 # Repacks the binary tarball
 printf "\nRecompressing binary tarball\n";
-tar -jvcf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .;
+tar -jvcf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .
-- 
cgit