summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-08 03:36:24 -0200
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-01-08 03:36:24 -0200
commit8b162e231366607be2b58c756dd5da23f9e32eb5 (patch)
tree9938a8cc13c0b226b0536acbe01b53cd94646000 /libre
parent975c0b33d06a2e74244b42b09db1e4745a8f537e (diff)
parent934febace70be028fe251b9984e9d8751fdd1b41 (diff)
downloadabslibre-8b162e231366607be2b58c756dd5da23f9e32eb5.tar.gz
abslibre-8b162e231366607be2b58c756dd5da23f9e32eb5.tar.bz2
abslibre-8b162e231366607be2b58c756dd5da23f9e32eb5.zip
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/libretools/PKGBUILD12
-rw-r--r--libre/libretools/libretools.install56
2 files changed, 16 insertions, 52 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 7daf4c071..569706f80 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20140106.1
-_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651
-_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
+pkgver=20131112
+_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
+_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
_packages_url=https://projects.parabolagnulinux.org/packages
source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -64,8 +64,8 @@ package_libretools() {
depends=(
"librelib=$pkgver"
- "gitget=$pkgver" # `createworkdir`
arch-install-scripts # `archroot` uses `pacstrap`
+ git # `createworkdir`
openssh # `librerelease`
rsync # `librerelease` and `makechrootpkg.sh`
subversion # `diff-unfree`
@@ -87,5 +87,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('246274cf5974d6adee536edbdb2447c0'
- 'ec69dffa68829f063224de19bbd55fa9')
+md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
+ '656008e8e35e6adba527b7bfc367b9f7')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index a451add36..d46990da8 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,49 +1,14 @@
#!/bin/sh
-_edit_code=" 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
-_edit_cmnt='#%s # commented out by the libretools post_install script'
-
-_add_cmnt='# The following line is added by the libretools post_install script'
-_add_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
-
-# This line was installed by previous versions of this script
-_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
-
-# has_line $line
-has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
-# add_line $line
-add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
-# del_line $line
-del_line() {
- local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
- if [[ "${#lineno[@]}" -gt 0 ]]; then
- sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
- fi
-}
-# rep_line $orig $replacement_bre
-rep_line() {
- local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
- if [[ "${#lineno[@]}" == 1 ]]; then
- sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
- fi
-}
+_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
# arg 1: the new package version
post_install() {
- if grep -q 'librefetch' etc/makepkg.conf; then
+ if grep -q 'libre::' etc/makepkg.conf; then
libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
- if has_line "$_old_code"; then
- libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf"
- del_line "$_old_code"
- post_install
- else
- return 0
- fi
else
- libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
- rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
- add_line "$_add_cmnt"
- add_line "$_add_code"
+ libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
+ printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
fi
}
@@ -54,11 +19,10 @@ post_upgrade() {
}
pre_remove() {
- libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-
- rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
- del_line "$_add_cmnt"
- del_line "$_add_code"
-
- del_line "$_old_code"
+ if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
+ libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+ sed -i '/libre::/d' etc/makepkg.conf
+ else
+ libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
+ fi
}