Fixed several issues

2 files changed, 18 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22ec5bc0aa54..48dd953ccce2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,14 @@
 pkgbase = scientifica-bdf
-    pkgver = 1.0
-    pkgrel = 1
-    url = https:://github.com/NerdyPepper/scientifica
-    arch = any
-    license = SIL
-    makedepends = git
-    makedepends = xorg-font-utils
-    source = git+https://githubl.com/NerdyPepper/scientifica
-    md5sums = SKIP
+	pkgdesc = Tall and condensed bitmap font for geeks.
+	pkgver = 1.1
+	pkgrel = 1
+	url = https://github.com/NerdyPepper/scientifica
+	arch = any
+	license = SIL
+	makedepends = git
+	makedepends = xorg-font-utils
+	source = git+https://github.com/NerdyPepper/scientifica.git
+	sha256sums = SKIP
 
 pkgname = scientifica-bdf
+
diff --git a/PKGBUILD b/PKGBUILD
index 3134abe49661..0ebc3dce3a87 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 #Maintainer: Neve Laughery <RewoundVHS@protonmail.com>
 
-pkgname=scientifica-font
+pkgname=scientifica-bdf
 _gitname=scientifica
-pkgver=1.0
+pkgver=1.1
 pkgrel=1
 pkgdesc='Tall and condensed bitmap font for geeks.'
 arch=('any')
@@ -14,20 +14,12 @@ source=('git+https://github.com/NerdyPepper/scientifica.git')
 sha256sums=('SKIP')
 
 build() {
-    mkdir $srcdir/pcf
-    cd $srcdir/scientifica/regular || exit
-    bdftopcf -o scientifica-11.pcf scientifica-11.bdf
-    mv *.pcf ../../pcf
-    cd ../bold || exit
-    bdftopcf -o scientificaBold-11.pcf scientificaBold-11.bdf
-    mv *.pcf ../../pcf
+    bdftopcf -o "$srcdir/$_gitname/regular/scientifica-11.pcf" "$srcdir/$_gitname/regular/scientifica-11.bdf"
+    bdftopcf -o "$srcdir/$_gitname/bold/scientificaBold-11.pcf" "$srcdir/$_gitname/bold/scientificaBold-11.bdf"
 }
 
 package() {
-    cd "$_gitname"
-    cd $srcdir/pcf || exit
-
-    install -d -m755 "$pkgdir/usr/share/fonts/misc"
-    install -D -m644 *.pcf "$pkgdir/usr/share/fonts/misc"
-    install -D -m644 $srcdir/$_gitname/LICENSE "$pkgdir/usr/share/licenses/scientifica-font/LICENSE"
+    install -D -m644 "$srcdir/$_gitname/regular/scientifica-11.pcf" "$pkgdir/usr/share/fonts/misc/scienfica-11.pcf"
+    install -D -m644 "$srcdir/$_gitname/bold/scientificaBold-11.pcf" "$pkgdir/usr/share/fonts/misc/scienficaBold-11.pcf"
+    install -D -m644 "$srcdir/$_gitname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }