From 69ce8eb8b7737c4d533db221c457be8a36d3d429 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Mon, 30 Mar 2020 09:17:21 +0200 Subject: [PATCH] fix leftover tarball path variable --- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index 0693e67..c503844 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -9,18 +9,13 @@ BINARY_TARBALL=$1; TOGGLE_SETTINGS_SCRIPT=$2; LAUNCHER_SCRIPT=$3; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} -OUTPUT_TARBALL=$CI_PROJECT_DIR/LibreWolf.${CARCH}.tar.bz2 _SCRIPT_FOLDER=$(realpath $(dirname $0)); _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; -# Moves the packaged tarball to the specified location -printf "\nMoving Binary Tarball to output location\n" -mv $BINARY_TARBALL $OUTPUT_TARBALL - # Extracts the binary tarball printf "\nExtracting librewolf binary tarball\n"; -tar -xf $OUTPUT_TARBALL -C $_EXTRACTED_TARBALL_FOLDER/..; +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"; @@ -54,4 +49,4 @@ END # Repacks the binary tarball printf "\nRecompressing binary tarball\n"; -tar -jvcf $OUTPUT_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .; +tar -jvcf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER .;