Small formatting tweaks, minor adjustments

3 files changed, 42 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6f63a47b1ff..43dde3c39af5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = scientifica-font
 	pkgdesc = Tall and condensed bitmap font for geeks.
 	pkgver = 1.0.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/NerdyPepper/scientifica
 	install = scientifica-font.install
 	arch = any
@@ -11,10 +11,10 @@ pkgbase = scientifica-font
 	depends = fontconfig
 	provides = scientifica-font
 	conflicts = scientifica-font
-	source = https://raw.githubusercontent.com/NerdyPepper/scientifica/master/bold/scientificaBold-11.bdf
 	source = https://raw.githubusercontent.com/NerdyPepper/scientifica/master/regular/scientifica-11.bdf
-	md5sums = 3767c286c70e670a86ee50c3e30ebfac
+	source = https://raw.githubusercontent.com/NerdyPepper/scientifica/master/bold/scientificaBold-11.bdf
 	md5sums = 1b23c948030e09bcac0bae375a0fca37
+	md5sums = 3767c286c70e670a86ee50c3e30ebfac
 
 pkgname = scientifica-font
 
diff --git a/PKGBUILD b/PKGBUILD
index 276ec68efcd4..4afa4f575a86 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,53 @@
 # Maintainer: Savino Jossi <savino.jossi@gmail.com>
-# Maintainer: Harry Law <orald@airmail.cc>
+# Maintainer: Harry Law <hasld@fea.st>
 
 _pkgname=scientifica
 pkgname=${_pkgname}-font
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Tall and condensed bitmap font for geeks.'
 arch=(any)
-url=https://github.com/NerdyPepper/scientifica
+url='https://github.com/NerdyPepper/scientifica'
 depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
 conflicts=(scientifica-font)
 provides=(scientifica-font)
-install=scientifica-font.install
-source=(https://raw.githubusercontent.com/NerdyPepper/${_pkgname}/master/bold/${_pkgname}Bold-11.bdf
-        https://raw.githubusercontent.com/NerdyPepper/${_pkgname}/master/regular/${_pkgname}-11.bdf)
-md5sums=('3767c286c70e670a86ee50c3e30ebfac'
-	 '1b23c948030e09bcac0bae375a0fca37')
+install=$pkgname.install
+source=(https://raw.githubusercontent.com/NerdyPepper/${_pkgname}/master/regular/${_pkgname}-11.bdf
+        https://raw.githubusercontent.com/NerdyPepper/${_pkgname}/master/bold/${_pkgname}Bold-11.bdf)
+md5sums=('1b23c948030e09bcac0bae375a0fca37'
+         '3767c286c70e670a86ee50c3e30ebfac')
 
-prepare()
-{
-  echo "Enabling bitmap fonts..."
-  rm -fv /etc/fonts/conf.d/10-autohint.conf /etc/fonts/conf.d/10-scale-bitmap-fonts.conf
-  echo "10-autohint and 10-scale-bitmap deleted."
-  rm -fv /etc/fonts/conf.d/70-no-bitmaps.conf
-  echo "70-no-bitmaps deleted."
-  if [[ ! -f /etc/fonts/conf.d/70-yes-bitmaps.conf ]]; then
-    ln -sf /etc/fonts/conf.avail/70-yes-bitmaps.conf "${pkgdir}/etc/fonts/conf.d/"
-	echo "70-yes-bitmaps symlinked."
-  fi
-
-}
-
-build()
-{
-echo "Building custom install script..."
-cat <<EOF > 75-yes-scientifica.conf
+build() {
+	cat << EOF > 75-yes-scientifica.conf
 <?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!-- Accept scientifica font -->
-  <selectfont>
-    <acceptfont>
-      <pattern>
-        <patelt name="family"><string>scientifica</string></patelt>
-      </pattern>
-    </acceptfont>
-  </selectfont>
+	<selectfont>
+		<acceptfont>
+			<pattern>
+				<patelt name="family">
+					<string>scientifica</string>
+				</patelt>
+			</pattern>
+		</acceptfont>
+	</selectfont>
 </fontconfig>
 EOF
 }
 
-package()
-{
-  echo "Installing regular and bold fonts..."
+package() {
   install -Dm644 scientifica-11.bdf "${pkgdir}/usr/share/fonts/misc/scientifica-11.bdf"
-  install -Dm644 scientificaBold-11.bdf "${pkgdir}/usr/share/fonts/misc/scientificaBold-11.bdf"
-  echo "Fonts in /usr/share/fonts/misc"
-  install -Dm644 75-yes-scientifica.conf "${pkgdir}/etc/fonts/conf.avail/75-yes-scientifica.conf"
-  echo "75-yes-scientifica in /etc/fonts/conf.avail"
-  install -dm755 "${pkgdir}/etc/fonts/conf.d"
-  install -dm755 "${pkgdir}/usr/share/fonts"
-  ln -sf -t "${pkgdir}/etc/fonts/conf.d" ../conf.avail/75-yes-scientifica.conf
-  echo "75-yes-scientifica sumlinked."
+	install -Dm644 scientificaBold-11.bdf "${pkgdir}/usr/share/fonts/misc/scientificaBold-11.bdf"
+	install -Dm644 75-yes-scientifica.conf "${pkgdir}/etc/fonts/conf.avail/75-yes-scientifica.conf"
+	install -dm755 "${pkgdir}/etc/fonts/conf.d"
+	install -dm755 "${pkgdir}/usr/share/fonts"
+	rm -vf "${pkgdir}/etc/fonts/conf.d/10-autohint.conf" "${pkgdir}/etc/fonts/conf.d/10-scale-bitmap-fonts.conf"
+	rm -vf "${pkgdir}/etc/fonts/conf.d/70-no-bitmaps.conf"
+	if [[ ! -f /etc/fonts/conf.d/70-yes-bitmaps.conf ]]; then
+		ln -vfs -t "${pkgdir}/etc/fonts/conf.d" "${pkgdir}/etc/fonts/conf.avail/70-yes-bitmaps.conf"
+  fi
+	ln -vfs -t "${pkgdir}/etc/fonts/conf.d" "${pkgdir}/etc/fonts/conf.avail/75-yes-scientifica.conf"
 }
+
+# vim: set ft=sh ts=2 sw=2 et:
diff --git a/scientifica-font.install b/scientifica-font.install
index e172368fd07b..1695868d51d4 100644
--- a/scientifica-font.install
+++ b/scientifica-font.install
@@ -1,14 +1,15 @@
 post_install() {
-  echo "Finalising the font directory..."
-  fc-cache -vfs
-  mkfontscale usr/share/fonts/misc
-  mkfontdir usr/share/fonts/misc
+	fc-cache -vfs
+	mkfontscale /usr/share/fonts/misc
+	mkfontdir /usr/share/fonts/misc
 }
 
 post_upgrade() {
-  post_install
+	post_install
 }
 
 post_remove() {
-  post_install
+	post_install
 }
+
+# vim: set ft=sh ts=2 sw=2 et: