From fcb0d9bed3e6bf80fe17a38631c6fb1434cdbff0 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Thu, 29 Oct 2020 02:18:46 +0100 Subject: v82.0.2-1 --- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 4 ++++ 1 file changed, 4 insertions(+) (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 c7517d1..d4826d4 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -11,6 +11,7 @@ LAUNCHER_SCRIPT=$3; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} _SCRIPT_FOLDER=$(realpath $(dirname $0)); _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; +_SETTINGS_COMMIT=8697f589a1499598b8af5df11d82b60e8c97d981 _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball @@ -22,6 +23,9 @@ tar --strip-components=1 -xf $BINARY_TARBALL -C $_EXTRACTED_TARBALL_FOLDER printf "\nCopying librewolf settings to extracted binary tarball\n"; git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings; +cd $_EXTRACTED_TARBALL_FOLDER/settings +git checkout $_SETTINGS_COMMIT +cd - # no need to keep that in there: rm -rf "${_EXTRACTED_TARBALL_FOLDER}/settings/.git"; cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings; -- cgit From aa51ea96c794d1b3d1c43ab753a3dce5000d3ef1 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sat, 21 Nov 2020 13:22:34 +0100 Subject: v83.0-1 --- binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 d4826d4..04bc086 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} _SCRIPT_FOLDER=$(realpath $(dirname $0)); _EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf; -_SETTINGS_COMMIT=8697f589a1499598b8af5df11d82b60e8c97d981 +_SETTINGS_COMMIT=2f76ae07f7016034273f1887b7f1bedab997909c _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball -- cgit