Update to v0.2.7.1.r102.gf94dece4 + overhaul PKGBUILD

6 files changed, 95 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8322a41c185..91d26f6dfcff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,27 @@
 pkgbase = funkin-git
-	pkgdesc = Build Friday Night Funkin from it's repository and install it with shortcuts.
-	pkgver = v0.2.6.r38.ga4b79ab
+	pkgdesc = A game originally made for Ludum Dare 47 "Stuck In a Loop"
+	pkgver = v0.2.7.1.r102.gf94dece4
 	pkgrel = 1
 	url = https://github.com/ninjamuffin99/Funkin
 	arch = x86_64
-	license = unknown
+	arch = i686
+	arch = pentium4
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
+	license = Apache
 	makedepends = git
 	makedepends = haxe
 	provides = funkin
 	conflicts = funkin
 	source = funkin-git::git://github.com/ninjamuffin99/Funkin.git
-	sha512sums = SKIP
+	source = APIStuff.hx
+	source = funkin.sh
+	source = funkin.desktop
+	sha256sums = SKIP
+	sha256sums = ade2e5b25db77b404a6ed074d59d7fa80c1cbb627e18e1cc3bf6177020eee92f
+	sha256sums = 75ef6c467feac3a57848b2f01677d88be40b3b79a826cb0d450d6f5fd7b11c1f
+	sha256sums = 7fe0fa2ac1312201c93f41cf9395c46703abf989e7f65783ff95e0d3b8c183e6
 
 pkgname = funkin-git
-
diff --git a/APIStuff.hx b/APIStuff.hx
new file mode 100644
index 000000000000..4b3a8c27dad7
--- /dev/null
+++ b/APIStuff.hx
@@ -0,0 +1,7 @@
+package;
+
+class APIStuff
+{
+    public static var API:String = "51348:TtzK0rZ8";
+    public static var EncKey:String = "5NqKsSVSNKHbF9fPgZPqPg==";
+}
diff --git a/PKGBUILD b/PKGBUILD
index 6edc7f9885ad..bc28c808e25c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,94 +1,72 @@
-# Maintainer: Elijah Bansley <elijahbansley@gmail.com>
+# Maintainer: Harrison <htv04rules at gmail dot com>
+# Contributor: Elijah Bansley <elijahbansley@gmail.com>
+
 pkgname=funkin-git
-pkgver=v0.2.6.r38.ga4b79ab
+pkgver=v0.2.7.1.r102.gf94dece4
 pkgrel=1
-pkgdesc="Build Friday Night Funkin from it's repository and install it with shortcuts."
-arch=('x86_64')
+pkgdesc="A game originally made for Ludum Dare 47 \"Stuck In a Loop\""
+arch=("x86_64" "i686" "pentium4" "arm" "armv6h" "armv7h" "aarch64")
 url="https://github.com/ninjamuffin99/Funkin"
-license=('unknown')
-depends=()
-makedepends=('git' 'haxe')
-provides=('funkin')
-conflicts=('funkin')
-source=("$pkgname"::"git://github.com/ninjamuffin99/Funkin.git")
-sha512sums=('SKIP')
+license=("Apache")
+makedepends=("git" "haxe")
+provides=("funkin")
+conflicts=("funkin")
+source=("${pkgname}"::"git://github.com/ninjamuffin99/Funkin.git"
+        "APIStuff.hx"
+        "funkin.sh"
+        "funkin.desktop")
+sha256sums=("SKIP"
+            "ade2e5b25db77b404a6ed074d59d7fa80c1cbb627e18e1cc3bf6177020eee92f"
+            "75ef6c467feac3a57848b2f01677d88be40b3b79a826cb0d450d6f5fd7b11c1f"
+            "7fe0fa2ac1312201c93f41cf9395c46703abf989e7f65783ff95e0d3b8c183e6")
 
 pkgver() {
-  cd "$srcdir/$pkgname"
-  git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g'
-}
-
-prepare() {
-    cd "$srcdir/$pkgname"
-    git submodule update --init
+  cd "${srcdir}/${pkgname}"
+  git describe --long --tags | sed "s/\([^-]*-g\)/r\1/;s/-/./g"
 }
 
 build() {
-    cd "$srcdir/$pkgname"
-    mkdir -p ~/haxelib
-    haxelib setup ~/haxelib
-    haxelib install lime
-    haxelib install openfl
-    haxelib install flixel
-    haxelib run lime setup flixel
-    haxelib run lime setup <<EOF
-y
-EOF
-    haxelib install flixel-tools
-    haxelib run flixel-tools setup <<EOF
-y
-4
-EOF
-    haxelib update flixel
-    haxelib update flixel-addons
-    lime install newgrounds
-    haxelib git polymod https://github.com/larsiusprime/polymod.git
-    cat <<EOF > $srcdir/$pkgname/source/APIStuff.hx
-package;
+  # Create/confirm local haxelib repo for libraries
+  haxelib newrepo
 
-class APIStuff
-{
-    public static var API:String = "51348:TtzK0rZ8";
-    public static var EncKey:String = "5NqKsSVSNKHbF9fPgZPqPg==";
-}
-EOF
-    lime build linux -final
-}
+  # Install and setup lime and HaxeFlixel
+  haxelib install lime
+  haxelib install openfl
+  haxelib install flixel
+  echo "n" | haxelib run lime setup # Decline prompt to add lime command
+  haxelib run lime setup flixel
+
+  # Install other depends
+  haxelib install newgrounds
+  haxelib git polymod https://github.com/larsiusprime/polymod.git
+  haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc.git
 
-check() {
-    cd "$srcdir/$pkgname"
-    #make -k check
+  # https://github.com/ninjamuffin99/Funkin/issues/146#issuecomment-755064854
+  cp APIStuff.hx ${srcdir}/${pkgname}/APIStuff.hx
+
+  # Build game
+  pushd "${srcdir}/${pkgname}" > /dev/null
+  haxelib run lime build linux -final
+  popd > /dev/null
 }
 
 package() {
-    cd "$srcdir/$pkgname"
-	
-    install -dm755 "$pkgdir/usr/share/funkin"
-    cp -R $srcdir/$pkgname/export/release/linux/bin/* "$pkgdir/usr/share/funkin/"
-	
-    cat <<EOF > $srcdir/$pkgname/funkin.sh
-#!/bin/bash
-pushd /usr/share/funkin > /dev/null
-./Funkin
-popd > /dev/null
-EOF
-	
-    install -D $srcdir/$pkgname/funkin.sh $pkgdir/usr/bin/funkin
-	
-    cat <<EOF > $srcdir/$pkgname/funkin.desktop
-[Desktop Entry]
-Version=1.0
-Name=Friday Night Funkin
-GenericName=Rhythm Game
-Comment="PRETTY DOPE ASS GAME" PLAYSTATION MAGAZINE MAY 2003 ISSUE
-Type=Application
-Terminal=false
-Exec=funkin
-Icon=funkin
-Categories=Game
-Keywords=game;funkin;friday;fridaynight;night;
-EOF
+  pushd "${srcdir}/${pkgname}" > /dev/null
+
+  # Copy game files to /usr/share/funkin
+  install -dm0755 "${pkgdir}/usr/share/funkin"
+  cp -r export/release/linux/bin/* "${pkgdir}/usr/share/funkin/"
+
+  # Install icons
+  for size in 16 32 64; do
+    install -Dm0644 "art/icon${size}.png" "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/funkin.png"
+  done
+
+  popd > /dev/null
+
+  # Install launcher script as binary
+  install -Dm0755 funkin.sh "${pkgdir}/usr/bin/funkin"
 
-    install -D $srcdir/$pkgname/art/icon.png $pkgdir/usr/share/pixmaps/funkin.png
-    install -D $srcdir/$pkgname/funkin.desktop $pkgdir/usr/share/applications/funkin.desktop
+  # Install desktop file
+  install -Dm0644 funkin.desktop "${pkgdir}/usr/share/applications/funkin.desktop"
 }
diff --git a/funkin.desktop b/funkin.desktop
new file mode 100644
index 000000000000..af738375e4e9
--- /dev/null
+++ b/funkin.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Friday Night Funkin'
+GenericName=Rhythm Game
+Comment=A game originally made for Ludum Dare 47 "Stuck in a Loop"
+Type=Application
+Terminal=false
+Exec=funkin
+Icon=funkin
+Categories=Game
diff --git a/funkin.sh b/funkin.sh
new file mode 100644
index 000000000000..28f07f4d1fed
--- /dev/null
+++ b/funkin.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Launcher for Friday Night Funkin' files in /usr/share/funkin
+
+cd /usr/share/funkin
+./Funkin
diff --git a/upload.sh b/upload.sh
deleted file mode 100755
index 0247b12eda53..000000000000
--- a/upload.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-echo "Enter the commit message: "
-read commit_message
-makepkg --printsrcinfo > .SRCINFO
-git add PKGBUILD .SRCINFO upload.sh
-git commit -m "$commit_message"