We should be building the Electron app and using that

1 files changed, 17 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4760cc2784d9..93535635a01b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,19 +10,17 @@ depends=('nodejs>=10.0.0' 'npm>=6.0.0')
 makedepens=('git')
 source=("git+${url}.git")
 
-foldername=PreMiD-git
-
 md5sums=('SKIP')
 
 pkgver() {
- cd "${foldername%-git}"
+ cd "${pkgname}"
  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package() {
 
 	# Set up file structure
-	mkdir -p "${pkgdir}/usr/lib/${pkgname%-git}/"
+	mkdir -p "${pkgdir}/usr/lib/${pkgname}/"
 	mkdir -p "${pkgdir}/usr/bin/"
 	mkdir -p "${pkgdir}/usr/share/applications"
 	mkdir -p "${pkgdir}/usr/share/pixmaps"
@@ -34,33 +32,40 @@ package() {
 	# Add launcher script to /usr/bin/
 	echo "#!/bin/bash
 	cd /usr/lib/premid/
-	npm start" > "${pkgdir}/usr/bin/premid"
-	chmod +x "${pkgdir}/usr/bin/premid"
+	./PreMiD" > "${pkgdir}/usr/bin/${pkgname}"
+	chmod +x "${pkgdir}/usr/bin/${pkgname}"
 
 	# Create application menu shortcut
 	echo "[Desktop Entry]
 	Name=PreMiD
 	GenericName=PreMiD
 	Comment=PreMiD adds Discord Rich Presence support to a lot of services you use and love.
-	Exec=/usr/bin/premid
+	Exec=/usr/bin/PreMiD
 	Terminal=false
 	Type=Application
 	Icon=premid.png" > "${pkgdir}/usr/share/applications/premid.desktop"
 	
 	# Install dependency modules
-	cd "${foldername%-git}/src"
+	cd "${pkgname}"
 	npm install
 
+	cd "${pkgname}"/src 
+	npm install 
+
+	cd "${pkgname}"
+	npm run pkglinux
+
 	# Copy the app files & dependency modules to package directory
-	mkdir -p "${pkgdir}/usr/lib/${pkgname%-git}/"
-	cp -r ./* "${pkgdir}/usr/lib/${pkgname%-git}/"
+	mkdir -p "${pkgdir}/usr/lib/${pkgname}/"
+	cd "${pkgname}"/out
+	cp -r ./* "${pkgdir}/usr/lib/${pkgname}/"
 
 	cp assets/images/logo.png "${pkgdir}/usr/share/pixmaps/premid.png"
 
 	# Copy a license file to package directory
-	install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname%-git}/LICENSE"
+	install -Dm644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
 	# Remove references to $srcdir of node_modules directory
-	grep -l "${srcdir}" -r "${pkgdir}" | xargs sed -i "s#${_git_srcdir}#/usr/lib/${pkgname%-git}#g"
+	grep -l "${srcdir}" -r "${pkgdir}" | xargs sed -i "s#${_git_srcdir}#/usr/lib/${pkgname}#g"
 
 }