Commit 6d539efc authored by Natanael Copa's avatar Natanael Copa

main/[various]: set -e build fix

parent dc4120b2
...@@ -36,7 +36,7 @@ package() { ...@@ -36,7 +36,7 @@ package() {
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
install -d "$pkgdir"/bin "$pkgdir"/usr/sbin install -d "$pkgdir"/bin "$pkgdir"/usr/sbin
cd "$pkgdir"/usr/bin/ cd "$pkgdir"/usr/bin/
......
...@@ -46,7 +46,7 @@ package() { ...@@ -46,7 +46,7 @@ package() {
cd "$builddir" cd "$builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
#fix conflict with gettext #fix conflict with gettext
rm "$pkgdir"/usr/share/locale/locale.alias rm "$pkgdir"/usr/share/locale/locale.alias
} }
......
...@@ -46,7 +46,7 @@ package() { ...@@ -46,7 +46,7 @@ package() {
cd "$_builddir" cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
return 0 return 0
} }
......
...@@ -30,8 +30,7 @@ package() { ...@@ -30,8 +30,7 @@ package() {
cd "$builddir" cd "$builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
return 0
} }
sha512sums="0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 grep-3.0.tar.xz" sha512sums="0e9a00df9d492f399230bae0264942edaf64bb926f93edb7922f27b075a86ba0a78698f54996cc522b6261aa01a8ecbeadeb68523d4470a9941f242c3ae24c58 grep-3.0.tar.xz"
...@@ -27,8 +27,7 @@ package() { ...@@ -27,8 +27,7 @@ package() {
cd "$srcdir/$pkgname-$pkgver" cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
return 0
} }
md5sums="cc825fa64bc7306a885f2fb2268d3ec5 groff-1.22.3.tar.gz" md5sums="cc825fa64bc7306a885f2fb2268d3ec5 groff-1.22.3.tar.gz"
......
...@@ -34,7 +34,7 @@ package() { ...@@ -34,7 +34,7 @@ package() {
make DESTDIR=$pkgdir install make DESTDIR=$pkgdir install
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
mkdir -p "$pkgdir"/bin mkdir -p "$pkgdir"/bin
mv "$pkgdir"/usr/bin/gzip "$pkgdir"/usr/bin/gunzip "$pkgdir"/bin/ mv "$pkgdir"/usr/bin/gzip "$pkgdir"/usr/bin/gunzip "$pkgdir"/bin/
......
...@@ -39,8 +39,7 @@ package() { ...@@ -39,8 +39,7 @@ package() {
cd "$_builddir" cd "$_builddir"
make SUBDIRS="intl po src man" DESTDIR="$pkgdir" install || return 1 make SUBDIRS="intl po src man" DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
return 0
} }
md5sums="98beafca62472805a3739d3867d5d70f indent-2.2.11.tar.gz" md5sums="98beafca62472805a3739d3867d5d70f indent-2.2.11.tar.gz"
......
...@@ -71,8 +71,7 @@ package() { ...@@ -71,8 +71,7 @@ package() {
echo "tun" > "$pkgdir"/etc/modules-load.d/libvirt.conf echo "tun" > "$pkgdir"/etc/modules-load.d/libvirt.conf
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
return 0
} }
dev() { dev() {
......
...@@ -81,9 +81,7 @@ package() { ...@@ -81,9 +81,7 @@ package() {
done done
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib "$pkgdir"/usr/include 2>/dev/null rmdir -p "$pkgdir"/usr/lib "$pkgdir"/usr/include 2>/dev/null || true
return 0
} }
tcp() { tcp() {
......
...@@ -42,7 +42,7 @@ package() { ...@@ -42,7 +42,7 @@ package() {
# Install basic terms in /etc/terminfo # Install basic terms in /etc/terminfo
for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \ for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \
vt200 vt220 xterm xterm-color xterm-xfree86; do vt200 vt220 xterm xterm-color xterm-xfree86; do
local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) local termfile=$(find "$pkgdir"/usr/share/terminfo/ -name "$i" 2>/dev/null) || true
local basedir=$(basename $(dirname "$termfile")) local basedir=$(basename $(dirname "$termfile"))
[ -z "$termfile" ] && continue [ -z "$termfile" ] && continue
......
...@@ -43,8 +43,7 @@ package() { ...@@ -43,8 +43,7 @@ package() {
cd "$_builddir" cd "$_builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
return 0
} }
md5sums="0247b6a7b314f8edeb618159fa95f9cb parted-3.2.tar.xz md5sums="0247b6a7b314f8edeb618159fa95f9cb parted-3.2.tar.xz
e87ffa1171acbebfa9d2475a093e7e64 fix-includes.patch" e87ffa1171acbebfa9d2475a093e7e64 fix-includes.patch"
......
...@@ -46,7 +46,7 @@ package() { ...@@ -46,7 +46,7 @@ package() {
make DESTDIR="$pkgdir/" install make DESTDIR="$pkgdir/" install
rm -rf "$pkgdir"/usr/lib/charset.alias rm -rf "$pkgdir"/usr/lib/charset.alias
rmdir -p "$pkgdir"/usr/lib 2>/dev/null rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
mkdir "$pkgdir"/bin mkdir "$pkgdir"/bin
mv "$pkgdir"/usr/bin/tar "$pkgdir"/bin/ mv "$pkgdir"/usr/bin/tar "$pkgdir"/bin/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment