diff options
author | grufo | 2020-09-22 04:24:53 +0100 |
---|---|---|
committer | grufo | 2020-09-22 04:24:53 +0100 |
commit | f611ffcd9efc7142878f6775af3fc048ee5ae9f5 (patch) | |
tree | 77133353f941e34729d1cd6c1ecb16f7c1151528 | |
parent | 476c9f8755daaa8983cdb3ef39224bce6eb17c92 (diff) | |
download | aur-f611ffcd9efc7142878f6775af3fc048ee5ae9f5.tar.gz |
Add `tor-browser.svg` and global review
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 51 | ||||
-rw-r--r-- | tor-browser.desktop.in (renamed from tor-browser.desktop) | 2 | ||||
-rwxr-xr-x | tor-browser.in (renamed from tor-browser.sh) | 13 | ||||
-rw-r--r-- | tor-browser.svg | 31 |
5 files changed, 74 insertions, 33 deletions
@@ -29,13 +29,15 @@ pkgbase = tor-browser optdepends = libnotify: Gnome dialog boxes noextract = tor-browser-linux32-9.5.4_en-US.tar.xz noextract = tor-browser-linux64-9.5.4_en-US.tar.xz - source = tor-browser.desktop + source = tor-browser.desktop.in + source = tor-browser.in source = tor-browser.png - source = tor-browser.sh + source = tor-browser.svg validpgpkeys = EF6E286DDA85EA2A4BA7DE684E2C6E8793298290 - sha256sums = 9ee0a4672e2d0835ffb94bcf26e17b56432030496a9cdf019b70c96083c24340 + sha256sums = a4210f777196ec5c7c6b10cbf10146d2c72086e85419ed72d0d0e7cb6bcbad25 + sha256sums = 8a6e0945571c332c1fc8b1cef11d15f699a752da2bb403bd0b65ee44821cc643 sha256sums = f25ccf68b47f5eb14c6fec0664c74f30ea9c6c58d42fc6abac3b64670aaa3152 - sha256sums = 89118837e6db1d7b089e0067a6430e9a1a8602a64e00b7ea94382abfb0d3e502 + sha256sums = 7b28b5dbe8ad573bb46e61b4d542b33e01ca240825ca640b4893fee6203b021f source_i686 = https://dist.torproject.org/torbrowser/9.5.4/tor-browser-linux32-9.5.4_en-US.tar.xz source_i686 = https://dist.torproject.org/torbrowser/9.5.4/tor-browser-linux32-9.5.4_en-US.tar.xz.asc sha256sums_i686 = 1320f20310793a0d429f4e2db8117da1bf01c6a50bcb652bd3b06e0f16659aa4 @@ -77,19 +77,26 @@ _dist_checksum() { } +# Make a string suitable for `sed`, by escaping []/&$.*^\ - syntax: `_sed_escape STRING` +_sed_escape() { + echo "${1}" | sed 's/[]\/&.*$^[]/\\&/g' +} + source_i686=("${_urlbase}/${pkgname}-${_tag_i686}-${pkgver}_${_language}.tar.xz"{,.asc}) source_x86_64=("${_urlbase}/${pkgname}-${_tag_x86_64}-${pkgver}_${_language}.tar.xz"{,.asc}) -source=("${pkgname}.desktop" +source=("${pkgname}.desktop.in" + "${pkgname}.in" "${pkgname}.png" - "${pkgname}.sh") + "${pkgname}.svg") ### IMPORTANT ################################################################# # No need for `makepkg -g`: the following sha256sums¸don't need to be updated # # with each release, everything is done automatically! Leave them like this! # ############################################################################### -sha256sums=('9ee0a4672e2d0835ffb94bcf26e17b56432030496a9cdf019b70c96083c24340' +sha256sums=('a4210f777196ec5c7c6b10cbf10146d2c72086e85419ed72d0d0e7cb6bcbad25' + '8a6e0945571c332c1fc8b1cef11d15f699a752da2bb403bd0b65ee44821cc643' 'f25ccf68b47f5eb14c6fec0664c74f30ea9c6c58d42fc6abac3b64670aaa3152' - '89118837e6db1d7b089e0067a6430e9a1a8602a64e00b7ea94382abfb0d3e502') + '7b28b5dbe8ad573bb46e61b4d542b33e01ca240825ca640b4893fee6203b021f') sha256sums_i686=($(_dist_checksum "${_tag_i686}") 'SKIP') sha256sums_x86_64=($(_dist_checksum "${_tag_x86_64}") @@ -119,32 +126,34 @@ prepare() { echo -e "\n ${_COL_LIGHTGREY_}TORBROWSER_PKGLANG='en-US' makepkg${_COL_DEFAULT_}\n" fi - # we search and replace using sed with / as delimiter below so don't allow slashes in these vars. - # makepkg already enforces that there're no slashes in ${pkgname}, so we don't check that again here. - if [[ ${pkgver} = */* || ${_language} = */* || ${pkgdesc} = */* ]]; then - error '${pkgver}, ${_language} and ${pkgdesc} for this package are not allowed to contain /' >&2 - return 1 - fi - } package() { cd "${srcdir}" - sed -i "s/__REPL_LANGUAGE__/${_language}/g" "${pkgname}.desktop" + local _sed_subst=" + s/@PACKAGE_NAME@/$(_sed_escape "${pkgname}")/g + s/@PACKAGE_VERSION@/$(_sed_escape "${pkgver}")/g + s/@PACKAGE_RELEASE@/$(_sed_escape "${pkgrel}")/g + s/@PACKAGE_LANGUAGE@/$(_sed_escape "${_language}")/g + s/@PACKAGE_ARCH@/$(_sed_escape "${_archstr}")/g + " + + install -dm755 "${pkgdir}/usr/bin" + sed "${_sed_subst}" "${pkgname}.in" > "${pkgdir}/usr/bin/${pkgname}" + chmod +x "${pkgdir}/usr/bin/${pkgname}" + + install -Dm 644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - sed -i "s/__REPL_NAME__/${pkgname}/g" "${pkgname}.sh" - sed -i "s/__REPL_VERSION__/${pkgver}/g" "${pkgname}.sh" - sed -i "s/__REPL_RELEASE__/${pkgrel}/g" "${pkgname}.sh" - sed -i "s/__REPL_LANGUAGE__/${_language}/g" "${pkgname}.sh" - sed -i "s/__REPL_ARCH__/${_archstr}/g" "${pkgname}.sh" + install -Dm 644 "${pkgname}.svg" "${pkgdir}/usr/share/pixmaps/${pkgname}.svg" - install -Dm 644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm 644 "${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -Dm 755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" + install -dm755 "${pkgdir}/usr/share/applications" + sed "${_sed_subst}" "${pkgname}.desktop.in" > \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm 644 "${pkgname}-${_archstr}-${pkgver}_${_language}.tar.xz" "${pkgdir}/opt/${pkgname}/${pkgname}-${_archstr}-${pkgver}_${_language}.tar.xz" + install -Dm 644 "${pkgname}-${_archstr}-${pkgver}_${_language}.tar.xz" \ + "${pkgdir}/opt/${pkgname}/${pkgname}-${_archstr}-${pkgver}_${_language}.tar.xz" } diff --git a/tor-browser.desktop b/tor-browser.desktop.in index aca8d1123e6e..bdcb62450de6 100644 --- a/tor-browser.desktop +++ b/tor-browser.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Tor Browser (__REPL_LANGUAGE__) +Name=Tor Browser (@PACKAGE_LANGUAGE@) Exec=/usr/bin/tor-browser Icon=tor-browser Categories=Network; diff --git a/tor-browser.sh b/tor-browser.in index 2ca37f23c427..9c3b0252ab17 100755 --- a/tor-browser.sh +++ b/tor-browser.in @@ -25,11 +25,11 @@ set -e # CONSTANTS AND VARIABLES # filled by PKGBUILD -_TB_PKGNAME_='__REPL_NAME__' -_TB_VERSION_='__REPL_VERSION__' -_TB_RELEASE_='__REPL_RELEASE__' -_TB_LANGUAGE_="__REPL_LANGUAGE__" -_TB_ARCH_='__REPL_ARCH__' +_TB_PKGNAME_='@PACKAGE_NAME@' +_TB_VERSION_='@PACKAGE_VERSION@' +_TB_RELEASE_='@PACKAGE_RELEASE@' +_TB_LANGUAGE_="@PACKAGE_LANGUAGE@" +_TB_ARCH_='@PACKAGE_ARCH@' # other constants and variables _TB_HOME_DIR_=~/".${_TB_PKGNAME_}" @@ -177,8 +177,7 @@ cd "${_TB_HOME_DIR_}" [[ ! -f "${_TB_VER_FILE_}" ]] && echo 0 > "${_TB_VER_FILE_}" # get the installed version -while read _TB_VER_LINE_ -do +while read _TB_VER_LINE_; do _TB_INSTALLED_VERSION_="${_TB_VER_LINE_}" done < "${_TB_VER_FILE_}" diff --git a/tor-browser.svg b/tor-browser.svg new file mode 100644 index 000000000000..f0ceb85eabd3 --- /dev/null +++ b/tor-browser.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <defs> + <linearGradient x1="50%" y1="100%" x2="50%" y2="0%" id="linearGradient-1"> + <stop stop-color="#420C5D" offset="0%"/> + <stop stop-color="#951AD1" offset="100%"/> + </linearGradient> + <path d="M25,29 C152.577777,29 256,131.974508 256,259 C256,386.025492 152.577777,489 25,489 L25,29 Z" id="path-2"/> + <filter x="-18.2%" y="-7.4%" width="129.4%" height="114.8%" filterUnits="objectBoundingBox" id="filter-3"> + <feOffset dx="-8" dy="0" in="SourceAlpha" result="shadowOffsetOuter1"/> + <feGaussianBlur stdDeviation="10" in="shadowOffsetOuter1" result="shadowBlurOuter1"/> + <feColorMatrix values="0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0 0.250980392 0 0 0 0.2 0" type="matrix" in="shadowBlurOuter1"/> + </filter> + </defs> + <g id="tor-browser-icon" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="icon_512x512"> + <g id="Group"> + <g id="tb_icon/Stable"> + <g id="Stable"> + <circle id="background" fill="#F2E4FF" fill-rule="nonzero" cx="256" cy="256" r="246"/> + <path d="M256.525143,465.439707 L256.525143,434.406609 C354.826191,434.122748 434.420802,354.364917 434.420802,255.992903 C434.420802,157.627987 354.826191,77.8701558 256.525143,77.5862948 L256.525143,46.5531962 C371.964296,46.8441537 465.446804,140.489882 465.446804,255.992903 C465.446804,371.503022 371.964296,465.155846 256.525143,465.439707 Z M256.525143,356.820314 C311.970283,356.529356 356.8487,311.516106 356.8487,255.992903 C356.8487,200.476798 311.970283,155.463547 256.525143,155.17259 L256.525143,124.146588 C329.115485,124.430449 387.881799,183.338693 387.881799,255.992903 C387.881799,328.654211 329.115485,387.562455 256.525143,387.846316 L256.525143,356.820314 Z M256.525143,201.718689 C286.266674,202.00255 310.3026,226.180407 310.3026,255.992903 C310.3026,285.812497 286.266674,309.990353 256.525143,310.274214 L256.525143,201.718689 Z M0,255.992903 C0,397.384044 114.60886,512 256,512 C397.384044,512 512,397.384044 512,255.992903 C512,114.60886 397.384044,0 256,0 C114.60886,0 0,114.60886 0,255.992903 Z" id="center" fill="url(#linearGradient-1)"/> + <g id="half" transform="translate(140.500000, 259.000000) scale(-1, 1) translate(-140.500000, -259.000000) "> + <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"/> + <use fill="url(#linearGradient-1)" fill-rule="evenodd" xlink:href="#path-2"/> + </g> + </g> + </g> + </g> + </g> + </g> +</svg>
\ No newline at end of file |