Date: Wednesday, September 30, 2015 @ 21:19:24
Author: seblu
Revision: 247939
upgpkg: filesystem 2015.09-1
- fix FS#46450
- cleanup vars
Modified:
filesystem/trunk/PKGBUILD
filesystem/trunk/profile
----------+
PKGBUILD | 43 ++++++++++++++++++++++---------------------
profile | 2 +-
2 files changed, 23 insertions(+), 22 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-09-30 19:16:00 UTC (rev 247938)
+++ PKGBUILD 2015-09-30 19:19:24 UTC (rev 247939)
@@ -2,7 +2,7 @@
# Maintainer: Tom Gundersen <t...@jklm.no>
pkgname=filesystem
-pkgver=2015.02
+pkgver=2015.09
pkgrel=1
pkgdesc='Base filesystem'
arch=('i686' 'x86_64')
@@ -35,7 +35,7 @@
'6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c'
'69e460404f45bdb7288d1de662e56dd9'
- '0b6f835598c7640184e476057b3c7722'
+ 'cfa3345c485c59e681ab39a44dc7ece1'
'a8a962370cd0128465d514e6a1f74130'
'2e193c4a37245f2323ebe87f1a673563'
'71ed98c52e11ada1f936ac8cb14eecd9')
@@ -66,7 +66,7 @@
}
build() {
- cd ${srcdir}
+ cd "$srcdir"
lint
@@ -74,13 +74,13 @@
}
package() {
- cd ${pkgdir}
+ cd "$pkgdir"
#
# setup root filesystem
#
for d in boot dev etc home mnt usr var opt srv/http run; do
- install -d -m755 ${d}
+ install -d -m755 $d
done
install -d -m555 proc
install -d -m555 sys
@@ -92,22 +92,23 @@
# setup /etc
install -d etc/{ld.so.conf.d,skel,profile.d}
for f in fstab group host.conf hosts issue ld.so.conf motd
nsswitch.conf passwd resolv.conf securetty shells profile; do
- install -m644 ${srcdir}/${f} etc/
+ install -m644 "$srcdir"/$f etc/
done
ln -s /proc/self/mounts etc/mtab
for f in gshadow shadow crypttab; do
- install -m600 ${srcdir}/${f} etc/
+ install -m600 "$srcdir"/$f etc/
done
touch etc/arch-release
- install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first
usr/lib/modprobe.d/usb-load-ehci-first.conf
- install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
+ install -D -m644 "$srcdir"/modprobe.d.usb-load-ehci-first
usr/lib/modprobe.d/usb-load-ehci-first.conf
+ install -m755 "$srcdir"/locale.sh etc/profile.d/locale.sh
install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release
# setup /var
for d in cache local opt log/old lib/misc empty; do
- install -d -m755 var/${d}
+ install -d -m755 var/$d
done
install -d -m1777 var/{tmp,spool/mail}
+
# allow setgid games to write scores
install -d -m775 -g games var/games
ln -s spool/mail var/mail
@@ -118,38 +119,38 @@
# setup /usr hierarchy
#
for d in bin include lib share/misc src; do
- install -d -m755 usr/${d}
+ install -d -m755 usr/$d
done
for d in $(seq 8); do
- install -d -m755 usr/share/man/man${d}
+ install -d -m755 usr/share/man/man$d
done
#
# add lib symlinks
#
- ln -s usr/lib ${pkgdir}/lib
- [[ ${CARCH} = "x86_64" ]] && (
- ln -s usr/lib ${pkgdir}/lib64
- ln -s lib ${pkgdir}/usr/lib64
+ ln -s usr/lib "$pkgdir"/lib
+ [[ $CARCH = 'x86_64' ]] && (
+ ln -s usr/lib "$pkgdir"/lib64
+ ln -s lib "$pkgdir"/usr/lib64
)
#
# add bin symlinks
#
- ln -s usr/bin ${pkgdir}/bin
- ln -s usr/bin ${pkgdir}/sbin
- ln -s bin ${pkgdir}/usr/sbin
+ ln -s usr/bin "$pkgdir"/bin
+ ln -s usr/bin "$pkgdir"/sbin
+ ln -s bin "$pkgdir"/usr/sbin
#
# install archlinux(7) manpage
#
- install -D -m644 ${srcdir}/archlinux.7 usr/share/man/man7/archlinux.7
+ install -D -m644 "$srcdir"/archlinux.7 usr/share/man/man7/archlinux.7
#
# setup /usr/local hierarchy
#
for d in bin etc games include lib man sbin share src; do
- install -d -m755 usr/local/${d}
+ install -d -m755 usr/local/$d
done
ln -s ../man usr/local/share/man
}
Modified: profile
===================================================================
--- profile 2015-09-30 19:16:00 UTC (rev 247938)
+++ profile 2015-09-30 19:19:24 UTC (rev 247939)
@@ -16,7 +16,7 @@
fi
# Source global bash config
-if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
+if test "$PS1" && test "$BASH" && test -z ${POSIXLY_CORRECT+x} && test -r
/etc/bash.bashrc; then
. /etc/bash.bashrc
fi
