summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-08-26 21:08:58 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-08-26 21:08:58 -0400
commita5add1aaa2bdae77cd76931ddac7a48ee6905c78 (patch)
tree98baee2fabbb4380d4b28a1ac1a887aeedfd418d /libre
parent0fd0c56a603c3f1c4460494c6179b5658528afab (diff)
downloadabslibre-a5add1aaa2bdae77cd76931ddac7a48ee6905c78.tar.gz
abslibre-a5add1aaa2bdae77cd76931ddac7a48ee6905c78.tar.bz2
abslibre-a5add1aaa2bdae77cd76931ddac7a48ee6905c78.zip
libre/libretools: Get just a little bit better at resolving makepkg.conf.pacnew
Diffstat (limited to 'libre')
-rw-r--r--libre/libretools/PKGBUILD2
-rw-r--r--libre/libretools/libretools.install3
2 files changed, 4 insertions, 1 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 5c952b223..b860e12e8 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -15,7 +15,7 @@ sha256sums=('63e473cd979804652a1324171f94cf74e0fcc1d2eb2258911adad2e98a473952'
'SKIP')
validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
-pkgrel=1
+pkgrel=2
arch=('any')
makedepends=(ruby-ronn)
checkdepends=(
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index cbf33bc77..1c1e77baa 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -8,6 +8,9 @@ post_upgrade() {
# Now that we've reverted the change, automatically resolve
# makepkg.conf.pacnew, if we can.
if [[ -f etc/makepkg.conf && -f etc/makepkg.conf.pacnew ]]; then
+ # remove a trailing newline--a likely remnant of merging .pacnew with the librefetch bit
+ sed -i '${/^$/d}' etc/makepkg.conf
+
local stock_sha256sum stock_sha256sums sha256sum
# Let's go back 1 year (from 2018-08-26)