diff --git a/.SRCINFO b/.SRCINFO index 8fc18d471928e..026d10327de05 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = thorium-browser-bin pkgdesc = Chromium fork focused on high performance and security pkgver = 126.0.6478.231 - pkgrel = 2 + pkgrel = 3 url = https://github.com/Alex313031/Thorium install = thorium-browser.install arch = x86_64 @@ -11,7 +11,7 @@ pkgbase = thorium-browser-bin options = !strip options = !debug source = https://github.com/Alex313031/Thorium/releases/download/M126.0.6478.231/thorium-browser_126.0.6478.231_SSE3.deb - sha256sums = SKIP + sha256sums = 5dcea3c3508b9fe6b4990d8663254f6a333a5a4fe0644a9f86ceca5a57444a27 pkgname = thorium-browser-bin depends = alsa-lib diff --git a/.nvchecker.toml b/.nvchecker.toml index dfb8a265e233b..47ac3339b5bd9 100644 --- a/.nvchecker.toml +++ b/.nvchecker.toml @@ -1,5 +1,4 @@ [thorium-browser-bin] -source = "github" -github = "Alex313031/Thorium" +source = "git" +git = "https://github.com/Alex313031/Thorium.git" prefix = "M" -use_latest_release = true diff --git a/PKGBUILD b/PKGBUILD index 11f884c3fdf7d..91cab6c20d5ad 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,16 +2,10 @@ # Contributor: JPratama7 # Contributor: Dominik Adrian Grzywak -# options -if [ -z "$_srcinfo" ] && [ -z "$_pkgver" ]; then - : ${_autoupdate:=true} -fi - -# basic info _pkgname="thorium-browser" pkgname="$_pkgname-bin" pkgver=126.0.6478.231 -pkgrel=2 +pkgrel=3 pkgdesc="Chromium fork focused on high performance and security" url="https://github.com/Alex313031/Thorium" license=('BSD') @@ -21,16 +15,12 @@ options=('!emptydirs' '!strip' '!debug') install="$_pkgname.install" _source_main() { - _dl_url="$url/releases/download/M${_pkgver:?}" - _dl_filename="${_pkgname}_${_pkgver:?}_SSE3.deb" + _dl_url="$url/releases/download/M${pkgver}" + _dl_filename="${_pkgname}_${pkgver}_SSE3.deb" noextract+=("$_dl_filename") source=("$_dl_url/$_dl_filename") - sha256sums=('SKIP') - - pkgver() { - echo "${_pkgver:?}" - } + sha256sums=('5dcea3c3508b9fe6b4990d8663254f6a333a5a4fe0644a9f86ceca5a57444a27') } prepare() { @@ -38,7 +28,7 @@ prepare() { #!/usr/bin/env bash # check microprocessor architecture level -if grep -qE '\bpni\b' /proc/cpuinfo ; then +if grep -qsE '\bpni\b' /proc/cpuinfo ; then _message='' _message+=\$'The fastest browser on Earth.' else @@ -141,35 +131,4 @@ package() { "$pkgdir/usr/share/menu/" } -_update_version() { - : ${_pkgver:=${pkgver%%.r*}} - - if [[ "${_autoupdate::1}" != "t" ]]; then - return - fi - local _blacklist _response _tags _tag _pkgver_new - - _blacklist=( - M126.0.6478.246 - ) - _response=$(curl -Ssf "$url/releases.atom") - _tags=$( - printf '%s' "$_response" \ - | grep '/releases/tag/' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' - ) - for i in "${_blacklist[@]}"; do - _tags=${_tags/$i/} - done - _tag=$(printf '%s' "$_tags" | sort -rV | head -1) - _pkgver_new="${_tag#M}" - - # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ]; then - _pkgver="${_pkgver_new:?}" - fi -} - -_update_version _source_main diff --git a/PKGBUILD.avx b/PKGBUILD.avx index 0f86252864496..1e0cd3cb18f42 100644 --- a/PKGBUILD.avx +++ b/PKGBUILD.avx @@ -1,11 +1,5 @@ # Maintainer: -# options -if [ -z "$_srcinfo" ] && [ -z "$_pkgver" ]; then - : ${_autoupdate:=true} -fi - -# basic info _pkgname="thorium-browser-avx" pkgname="$_pkgname-bin" pkgver=126.0.6478.231 @@ -18,16 +12,12 @@ arch=('x86_64') options=('!emptydirs' '!strip' '!debug') _source_main() { - _dl_url="$url/releases/download/M${_pkgver:?}" - _dl_filename="${_pkgname%-avx}_${_pkgver:?}_AVX.deb" + _dl_url="$url/releases/download/M${pkgver}" + _dl_filename="${_pkgname%-avx}_${pkgver}_AVX.deb" noextract+=("$_dl_filename") source=("$_dl_url/$_dl_filename") sha256sums=('SKIP') - - pkgver() { - echo "${_pkgver:?}" - } } prepare() { @@ -35,7 +25,7 @@ prepare() { #!/usr/bin/env bash # check microprocessor architecture level -if grep -qE '\bavx\b' /proc/cpuinfo ; then +if grep -qsE '\bavx\b' /proc/cpuinfo ; then _message='' _message+=\$'The fastest browser on Earth.' else @@ -174,35 +164,4 @@ package() { "$pkgdir/usr/share/menu/" } -_update_version() { - : ${_pkgver:=${pkgver%%.r*}} - - if [[ "${_autoupdate::1}" != "t" ]]; then - return - fi - local _blacklist _response _tags _tag _pkgver_new - - _blacklist=( - M126.0.6478.246 - ) - _response=$(curl -Ssf "$url/releases.atom") - _tags=$( - printf '%s' "$_response" \ - | grep '/releases/tag/' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' - ) - for i in "${_blacklist[@]}"; do - _tags=${_tags/$i/} - done - _tag=$(printf '%s' "$_tags" | sort -rV | head -1) - _pkgver_new="${_tag#M}" - - # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ]; then - _pkgver="${_pkgver_new:?}" - fi -} - -_update_version _source_main diff --git a/PKGBUILD.avx2 b/PKGBUILD.avx2 index 82d79793be6bd..e752234ff15b2 100644 --- a/PKGBUILD.avx2 +++ b/PKGBUILD.avx2 @@ -1,11 +1,5 @@ # Maintainer: -# options -if [ -z "$_srcinfo" ] && [ -z "$_pkgver" ]; then - : ${_autoupdate:=true} -fi - -# basic info _pkgname="thorium-browser-avx2" pkgname="$_pkgname-bin" pkgver=124.0.6367.218 @@ -18,16 +12,12 @@ arch=('x86_64') options=('!emptydirs' '!strip' '!debug') _source_main() { - _dl_url="$url/releases/download/M${_pkgver:?}" - _dl_filename="${_pkgname%-avx2}_${_pkgver:?}_AVX2.deb" + _dl_url="$url/releases/download/M${pkgver}" + _dl_filename="${_pkgname%-avx2}_${pkgver}_AVX2.deb" noextract+=("$_dl_filename") source=("$_dl_url/$_dl_filename") sha256sums=('SKIP') - - pkgver() { - echo "${_pkgver%M}" - } } prepare() { @@ -35,7 +25,7 @@ prepare() { #!/usr/bin/env bash # check microprocessor architecture level -if grep -qE '\bavx2\b' /proc/cpuinfo ; then +if grep -qsE '\bavx2\b' /proc/cpuinfo ; then _message='' _message+=\$'The fastest browser on Earth.' else @@ -174,36 +164,4 @@ package() { "$pkgdir/usr/share/menu/" } -_update_version() { - : ${_pkgver:=${pkgver%%.r*}} - - if [[ "${_autoupdate::1}" != "t" ]]; then - return - fi - local _blacklist _response _tags _tag _pkgver_new - - _blacklist=( - M126.0.6478.246 - M126.0.6478.231 - ) - _response=$(curl -Ssf "$url/releases.atom") - _tags=$( - printf '%s' "$_response" \ - | grep '/releases/tag/' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' - ) - for i in "${_blacklist[@]}"; do - _tags=${_tags/$i/} - done - _tag=$(printf '%s' "$_tags" | sort -rV | head -1) - _pkgver_new="${_tag#M}" - - # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ]; then - _pkgver="${_pkgver_new:?}" - fi -} - -_update_version _source_main diff --git a/PKGBUILD.i386 b/PKGBUILD.i386 index c1e77bb23a0e7..835c5d516ea08 100644 --- a/PKGBUILD.i386 +++ b/PKGBUILD.i386 @@ -1,11 +1,5 @@ # Maintainer: -# options -if [ -z "$_srcinfo" ] && [ -z "$_pkgver" ]; then - : ${_autoupdate:=true} -fi - -# basic info _pkgname="thorium-browser-i386" pkgname="$_pkgname-bin" pkgver=123.0.6312.134 @@ -18,16 +12,12 @@ arch=('i386') options=('!emptydirs' '!strip' '!debug') _source_main() { - _dl_url="$url/releases/download/M${_pkgver:?}" - _dl_filename="${_pkgname%-i386}_${_pkgver:?}_i386.deb" + _dl_url="$url/releases/download/M${pkgver}" + _dl_filename="${_pkgname%-i386}_${pkgver}_i386.deb" noextract+=("$_dl_filename") source=("$_dl_url/$_dl_filename") sha256sums=('SKIP') - - pkgver() { - echo "${_pkgver:?}" - } } prepare() { @@ -156,37 +146,4 @@ package() { "$pkgdir/usr/share/menu/" } -_update_version() { - : ${_pkgver:=${pkgver%%.r*}} - - if [[ "${_autoupdate::1}" != "t" ]]; then - return - fi - local _blacklist _response _tags _tag _pkgver_new - - _blacklist=( - M126.0.6478.246 - M126.0.6478.231 - M124.0.6367.218 - ) - _response=$(curl -Ssf "$url/releases.atom") - _tags=$( - printf '%s' "$_response" \ - | grep '/releases/tag/' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' - ) - for i in "${_blacklist[@]}"; do - _tags=${_tags/$i/} - done - _tag=$(printf '%s' "$_tags" | sort -rV | head -1) - _pkgver_new="${_tag#M}" - - # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ]; then - _pkgver="${_pkgver_new:?}" - fi -} - -_update_version _source_main diff --git a/PKGBUILD.sse3 b/PKGBUILD.sse3 index 83331f92fbfd6..69ac256dd563b 100644 --- a/PKGBUILD.sse3 +++ b/PKGBUILD.sse3 @@ -1,11 +1,5 @@ # Maintainer: -# options -if [ -z "$_srcinfo" ] && [ -z "$_pkgver" ]; then - : ${_autoupdate:=true} -fi - -# basic info _pkgname="thorium-browser-sse3" pkgname="$_pkgname-bin" pkgver=126.0.6478.231 @@ -18,16 +12,12 @@ arch=('x86_64') options=('!emptydirs' '!strip' '!debug') _source_main() { - _dl_url="$url/releases/download/M${_pkgver:?}" - _dl_filename="${_pkgname%-sse3}_${_pkgver:?}_SSE3.deb" + _dl_url="$url/releases/download/M${pkgver}" + _dl_filename="${_pkgname%-sse3}_${pkgver}_SSE3.deb" noextract+=("$_dl_filename") source=("$_dl_url/$_dl_filename") sha256sums=('SKIP') - - pkgver() { - echo "${_pkgver:?}" - } } prepare() { @@ -35,7 +25,7 @@ prepare() { #!/usr/bin/env bash # check microprocessor architecture level -if grep -qE '\bpni\b' /proc/cpuinfo ; then +if grep -qsE '\bpni\b' /proc/cpuinfo ; then _message='' _message+=\$'The fastest browser on Earth.' else @@ -174,35 +164,4 @@ package() { "$pkgdir/usr/share/menu/" } -_update_version() { - : ${_pkgver:=${pkgver%%.r*}} - - if [[ "${_autoupdate::1}" != "t" ]]; then - return - fi - local _blacklist _response _tags _tag _pkgver_new - - _blacklist=( - M126.0.6478.246 - ) - _response=$(curl -Ssf "$url/releases.atom") - _tags=$( - printf '%s' "$_response" \ - | grep '/releases/tag/' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' - ) - for i in "${_blacklist[@]}"; do - _tags=${_tags/$i/} - done - _tag=$(printf '%s' "$_tags" | sort -rV | head -1) - _pkgver_new="${_tag#M}" - - # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ]; then - _pkgver="${_pkgver_new:?}" - fi -} - -_update_version _source_main diff --git a/PKGBUILD.sse4 b/PKGBUILD.sse4 index 06f8e263d3363..90565129521dd 100644 --- a/PKGBUILD.sse4 +++ b/PKGBUILD.sse4 @@ -1,11 +1,5 @@ # Maintainer: -# options -if [ -z "$_srcinfo" ] && [ -z "$_pkgver" ]; then - : ${_autoupdate:=true} -fi - -# basic info _pkgname="thorium-browser-sse4" pkgname="$_pkgname-bin" pkgver=126.0.6478.231 @@ -18,16 +12,12 @@ arch=('x86_64') options=('!emptydirs' '!strip' '!debug') _source_main() { - _dl_url="$url/releases/download/M${_pkgver:?}" - _dl_filename="${_pkgname%-sse4}_${_pkgver:?}_SSE4.deb" + _dl_url="$url/releases/download/M${pkgver}" + _dl_filename="${_pkgname%-sse4}_${pkgver}_SSE4.deb" noextract+=("$_dl_filename") source=("$_dl_url/$_dl_filename") sha256sums=('SKIP') - - pkgver() { - echo "${_pkgver:?}" - } } prepare() { @@ -35,7 +25,7 @@ prepare() { #!/usr/bin/env bash # check microprocessor architecture level -if grep -qE '\bsse4' /proc/cpuinfo ; then +if grep -qsE '\bsse4' /proc/cpuinfo ; then _message='' _message+=\$'The fastest browser on Earth.' else @@ -174,35 +164,4 @@ package() { "$pkgdir/usr/share/menu/" } -_update_version() { - : ${_pkgver:=${pkgver%%.r*}} - - if [[ "${_autoupdate::1}" != "t" ]]; then - return - fi - local _blacklist _response _tags _tag _pkgver_new - - _blacklist=( - M126.0.6478.246 - ) - _response=$(curl -Ssf "$url/releases.atom") - _tags=$( - printf '%s' "$_response" \ - | grep '/releases/tag/' \ - | sed -E 's@^.*/releases/tag/(.*)".*$@\1@' \ - | grep -Ev '[a-z]{2}' - ) - for i in "${_blacklist[@]}"; do - _tags=${_tags/$i/} - done - _tag=$(printf '%s' "$_tags" | sort -rV | head -1) - _pkgver_new="${_tag#M}" - - # update _pkgver - if [ "$_pkgver" != "${_pkgver_new:?}" ]; then - _pkgver="${_pkgver_new:?}" - fi -} - -_update_version _source_main diff --git a/thorium-browser.install b/thorium-browser.install index 3f5b2bbb2b706..5a4745e568585 100644 --- a/thorium-browser.install +++ b/thorium-browser.install @@ -23,7 +23,7 @@ CYAN="${BOLD}$(tput setaf 6)" WHITE="${BOLD}$(tput setaf 7)" post_install() { - if /usr/lib/ld-linux-x86-64.so.2 --help | grep -qsE '^\s+x86-64-v3.*supported.*$' ; then + if grep -qsE '\bpni\b' /proc/cpuinfo ; then note1 "Custom flags should be put directly in: ~/.config/thorium-flags.conf" note2 "The launcher is called: 'thorium-browser'" else