hotfix for the hotfix

2 files changed, 5 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9118d3ba7c3c..8f9289e9288a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,9 +11,9 @@ pkgbase = feedthebeast-classic
 	depends = xorg-xrandr
 	depends = ttf-dejavu
 	depends = libzip
-	noextract = feedthebeast-classic-1.5.1.jar
+	noextract = feedthebeast-1.5.1.jar
 	source = feedthebeast-classic
-	source = feedthebeast-classic-1.5.1.jar::https://dist.creeper.host/FTB2/launcher/FTB_Launcher.jar
+	source = feedthebeast-1.5.1.jar::https://dist.creeper.host/FTB2/launcher/FTB_Launcher.jar
 	sha256sums = SKIP
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 5f24f1d9665b..10ed333840de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,21 +15,20 @@ license=('Apache')
 depends=('java-runtime=8' 'hicolor-icon-theme' 'xorg-xrandr' 'ttf-dejavu' 'libzip')
 makedepends=('gendesk')
 source=("$pkgname"
-	"${pkgname}-$pkgver.jar"::"https://dist.creeper.host/FTB2/launcher/FTB_Launcher.jar")
-noextract=("${pkgname}-$pkgver.jar")
+	"${_pkgname}-$pkgver.jar"::"https://dist.creeper.host/FTB2/launcher/FTB_Launcher.jar")
+noextract=("${_pkgname}-$pkgver.jar")
 sha256sums=('SKIP'
             'SKIP')
 
 prepare() {
     # generate .desktop
-    cd "${srcdir}/${_pkgname}"
     gendesk --pkgname "Feed The Beast Classic" --pkgdesc "${pkgdesc}" --icon ${pkgname} --exec "/usr/bin/${pkgname}" -n -f
     mv "Feed The Beast Classic.desktop" "${pkgname}.desktop"
 }
 
 package() {
     install -Dm755 "$pkgname" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${pkgname}-$pkgver.jar" "${pkgdir}/usr/share/${pkgname}/${pkgname}.jar"
+    install -Dm644 "${pkgname}-$pkgver.jar" "${pkgdir}/usr/share/${_pkgname}/${_pkgname}.jar"
     install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
     bsdtar -xf "${pkgname}-$pkgver.jar" image/logo_ftb_large.png
     install -d -m755 "${pkgdir}/usr/share/icons/hicolor"