summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyano Hao2017-07-28 23:49:16 +0800
committerCyano Hao2017-07-28 23:49:16 +0800
commit90501d36de282c6402971fd8cf9fb3b7e7ddb611 (patch)
treea77a8032dac25c575fc811fe9f5b97f01905427e
parenta4d53302be02ba24696df3a61209fe79c8b5364b (diff)
downloadaur-90501d36de282c6402971fd8cf9fb3b7e7ddb611.tar.gz
adjust directory structure
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD13
2 files changed, 14 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index fa85030d137..8ba312aa4f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = firefox-nightly-en-gb
pkgdesc = Standalone Web Browser from Mozilla — Nightly build (en-GB)
- pkgver = 56.0a1.20170726.100241
+ pkgver = 56.0a1.20170728.100358
pkgrel = 1
url = https://www.mozilla.org/en-GB/firefox/nightly
arch = i686
@@ -28,15 +28,15 @@ pkgbase = firefox-nightly-en-gb
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
sha512sums = b514abafc559ec03a4222442fa4306db257c3de9e18ed91a0b37cc9d7058a8e08a241442e54a67659a3ab4512a5dae6a0b94ea7a33d08ef0b8a76a9eac902095
sha512sums = bae5a952d9b92e7a0ccc82f2caac3578e0368ea6676f0a4bc69d3ce276ef4f70802888f882dda53f9eb8e52911fb31e09ef497188bcd630762e1c0f5293cc010
- source_i686 = 20170727-firefox-56.0a1.en-GB.linux-i686.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-i686.tar.bz2
- source_i686 = 20170727-firefox-56.0a1.en-GB.linux-i686.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-i686.tar.bz2.asc
- source_i686 = 20170727-firefox-56.0a1.en-GB.linux-i686.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.txt
+ source_i686 = 20170728-firefox-56.0a1.en-GB.linux-i686.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-i686.tar.bz2
+ source_i686 = 20170728-firefox-56.0a1.en-GB.linux-i686.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-i686.tar.bz2.asc
+ source_i686 = 20170728-firefox-56.0a1.en-US.linux-i686.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-i686.txt
sha512sums_i686 = SKIP
sha512sums_i686 = SKIP
sha512sums_i686 = SKIP
- source_x86_64 = 20170727-firefox-56.0a1.en-GB.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-x86_64.tar.bz2
- source_x86_64 = 20170727-firefox-56.0a1.en-GB.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-x86_64.tar.bz2.asc
- source_x86_64 = 20170727-firefox-56.0a1.en-GB.linux-x86_64.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.txt
+ source_x86_64 = 20170728-firefox-56.0a1.en-GB.linux-x86_64.tar.bz2::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-x86_64.tar.bz2
+ source_x86_64 = 20170728-firefox-56.0a1.en-GB.linux-x86_64.tar.bz2.asc::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central-l10n/firefox-56.0a1.en-GB.linux-x86_64.tar.bz2.asc
+ source_x86_64 = 20170728-firefox-56.0a1.en-US.linux-x86_64.txt::https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/firefox-56.0a1.en-US.linux-x86_64.txt
sha512sums_x86_64 = SKIP
sha512sums_x86_64 = SKIP
sha512sums_x86_64 = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 97293af3a95..bae0cdad233 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,12 @@
_name=firefox
_channel=nightly
_lang=en-GB
+_pkgname_en_us=${_name}-${_channel}
pkgname=${_name}-${_channel}-${_lang,,}
pkgdesc="Standalone Web Browser from Mozilla — Nightly build (${_lang})"
url="https://www.mozilla.org/${_lang}/${_name}/${_channel}"
_version=56.0a1
-pkgver=56.0a1.20170727.162531
+pkgver=56.0a1.20170728.100358
pkgrel=1
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
@@ -50,24 +51,24 @@ pkgver() {
}
package() {
- OPT_PATH="opt/${pkgname}"
+ OPT_PATH="opt/${_pkgname_en_us}"
# Install the package files
install -d "${pkgdir}"/{usr/bin,opt}
cp -r ${_name} "${pkgdir}"/${OPT_PATH}
- ln -s "/${OPT_PATH}/${_name}" "${pkgdir}"/usr/bin/firefox-nightly
+ ln -s "/${OPT_PATH}/${_name}" "${pkgdir}"/usr/bin/${_pkgname_en_us}
# Install .desktop files
- install -Dm644 "${srcdir}"/firefox-nightly.desktop -t "${pkgdir}"/usr/share/applications
+ install -Dm644 "${srcdir}"/${_pkgname_en_us}.desktop -t "${pkgdir}"/usr/share/applications
# Install icons
SRC_LOC="${srcdir}"/${_name}/browser
DEST_LOC="${pkgdir}"/usr/share/icons/hicolor
for i in 16 32 48
do
- install -Dm644 "${SRC_LOC}"/chrome/icons/default/default${i}.png "${DEST_LOC}"/${i}x${i}/apps/${pkgname}.png
+ install -Dm644 "${SRC_LOC}"/chrome/icons/default/default${i}.png "${DEST_LOC}"/${i}x${i}/apps/${_pkgname_en_us}.png
done
- install -Dm644 "${SRC_LOC}"/icons/mozicon128.png "${DEST_LOC}"/128x128/apps/${pkgname}.png
+ install -Dm644 "${SRC_LOC}"/icons/mozicon128.png "${DEST_LOC}"/128x128/apps/${_pkgname_en_us}.png
# Disable auto-updates
install -Dm644 "${srcdir}"/vendor.js -t "${pkgdir}"/${OPT_PATH}/browser/defaults/preferences