diff options
| -rw-r--r-- | scripts/prep-librewolf-dpkg.conf | 6 | ||||
| -rwxr-xr-x | scripts/prep-librewolf-dpkg.sh | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/scripts/prep-librewolf-dpkg.conf b/scripts/prep-librewolf-dpkg.conf index 684af18..737d803 100644 --- a/scripts/prep-librewolf-dpkg.conf +++ b/scripts/prep-librewolf-dpkg.conf @@ -4,11 +4,11 @@ # Available options for DISTRO: debian DISTRO=${DISTRO:-'debian'} # current version of Firefox package in target distro -distro_firefox_version=${distro_firefox_version:-'104.0-1'} +distro_firefox_version=${distro_firefox_version:-'105.0-1'} # current version of Firefox, as defined by name of the orig tarball. -firefox_version=${firefox_version:-'104.0'} +firefox_version=${firefox_version:-'105.0'} # Tag for LibreWolf linux repo -librewolf_version=${librewolf_version:-'104.0-1'} +librewolf_version=${librewolf_version:-'105.0.1-1'} settings_commit=${settings_commit:-'master'} CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)} output_dir=${CI_PROJECT_DIR}/out diff --git a/scripts/prep-librewolf-dpkg.sh b/scripts/prep-librewolf-dpkg.sh index 7feb35b..4cdd64c 100755 --- a/scripts/prep-librewolf-dpkg.sh +++ b/scripts/prep-librewolf-dpkg.sh @@ -372,7 +372,9 @@ sed -i -r "${debian_dir}"/rules \ -e '/override_dh_auto_configure/a\ cp -pf debian/search-config.json services/settings/dumps/main/' # Fetch latest uBlock Origin webextensions -latest_ubo_url="$( curl --silent https://api.github.com/repos/gorhill/uBlock/releases/latest | jq '.assets[].browser_download_url | match(".*firefox.*xpi").string' | tr -d '"' )" +# get latest non-beta, non-Lite tag version +ubo_version="$( curl --silent https://api.github.com/repos/gorhill/uBlock/releases | jq '.[] | select(.tag_name|contains("b")|not)|select(.tag_name|contains("Lite")|not)|.tag_name' | head -n1 | tr -d '"' )" +latest_ubo_url="$( curl --silent "https://api.github.com/repos/gorhill/uBlock/releases/tags/${ubo_version}" | jq '.assets[].browser_download_url | match(".*firefox.*xpi").string' | tr -d '"' )" curl --silent --location --output "${debian_dir}/uBlock0@raymondhill.net.xpi" "${latest_ubo_url}" if test "${DISTRO}" = "debian" ; then |