From 25f38919080ad72f197b3ac14e6520efe44d04a3 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Thu, 24 Jun 2021 12:54:38 +0200 Subject: [PATCH] v89.0.2-1 and get settings/common tags from env --- scripts/3_Configure_Source_Code.sh | 2 +- scripts/5_Configure_Binary_Tarball.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/3_Configure_Source_Code.sh b/scripts/3_Configure_Source_Code.sh index e4fb7df..9b3dbb5 100755 --- a/scripts/3_Configure_Source_Code.sh +++ b/scripts/3_Configure_Source_Code.sh @@ -7,7 +7,7 @@ set -e srcdir=$1; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} _COMMON_REPO='https://gitlab.com/librewolf-community/browser/common.git'; -_COMMON_TAG='v89.0.1-1' +_COMMON_TAG="v${pkgver}-${pkgrel}" _COMMON_DIR="${CI_PROJECT_DIR}"/common _PATCHES_DIR="${_COMMON_DIR}"/patches _MOZBUILD=$srcdir/../mozbuild diff --git a/scripts/5_Configure_Binary_Tarball.sh b/scripts/5_Configure_Binary_Tarball.sh index b086442..d4d9485 100755 --- a/scripts/5_Configure_Binary_Tarball.sh +++ b/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_TAG='1.1' +_SETTINGS_TAG=${SETTINGS_TAG:-'1.1'} _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball