filesystem-2015.09-1.parabola1: updating version

* fix FS#46450 -> https://bugs.archlinux.org/task/46450
* cleanup vars

2 files changed, 29 insertions, 28 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 6ef78a1d6..08a12bd6b 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 231606 2015-02-15 21:59:45Z dreisner $
+# $Id: PKGBUILD 247939 2015-09-30 19:19:24Z seblu $
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=filesystem
-pkgver=2015.02
+pkgver=2015.09
 pkgrel=1.parabola1
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'armv7h')
@@ -14,8 +14,8 @@ groups=('base')
 install='filesystem.install'
 makedepends=('asciidoc')
 depends=('iana-etc')
-replaces=(${pkgname}-parabola)
-conflicts=(${pkgname}-parabola)
+replaces=(filesystem-parabola)
+conflicts=(filesystem-parabola)
 backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
@@ -39,7 +39,7 @@ md5sums=('4d7417d2bf8872665c0907f09ae37c34'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '22518e922891f9359f971f4f5b4e793c'
          '69e460404f45bdb7288d1de662e56dd9'
-         '0b6f835598c7640184e476057b3c7722'
+         'cfa3345c485c59e681ab39a44dc7ece1'
          'a8a962370cd0128465d514e6a1f74130'
          'd5732ffdb3488e1383d4ea199343e767'
          '71ed98c52e11ada1f936ac8cb14eecd9')
@@ -70,7 +70,7 @@ lint() {
 }
 
 build() {
-	cd ${srcdir}
+	cd "$srcdir"
 
 	lint
 
@@ -78,13 +78,13 @@ build() {
 }
 
 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
@@ -96,23 +96,24 @@ package() {
 	# 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/parabola-release
 	ln -sv parabola-release 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
@@ -123,43 +124,43 @@ package() {
 	# 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
 	)
-	[[ ${CARCH} = "mips64el" ]] && (
+	[[ $CARCH = 'mips64el' ]] && (
 		# For the N32 ABI.
-		ln -s usr/lib ${pkgdir}/lib32
-		ln -s lib ${pkgdir}/usr/lib32
+		ln -s usr/lib "$pkgdir"/lib32
+		ln -s lib "$pkgdir"/usr/lib32
 	)
 
 	#
 	# 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 parabola(7) manpage
 	#
-	install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7
+	install -D -m644 "$srcdir"/parabola.7 usr/share/man/man7/parabola.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
 }
diff --git a/libre/filesystem/profile b/libre/filesystem/profile
index 59d0abc83..60c1821dd 100644
--- a/libre/filesystem/profile
+++ b/libre/filesystem/profile
@@ -16,7 +16,7 @@ if test -d /etc/profile.d/; then
 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