2.9 + arvedui suggestion

2 files changed, 12 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbfd7524fcfa..152366d14043 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fluffy-switch
-	pkgdesc = Goldtree and Tinfoil GUI for USB install on switch
-	pkgver = 2.8
-	pkgrel = 2
+	pkgdesc = Goldtree and Tinfoil GUI for USB/Network install on switch
+	pkgver = 2.9
+	pkgrel = 1
 	url = https://github.com/fourminute/Fluffy
 	arch = any
 	license = GPL
@@ -10,9 +10,8 @@ pkgbase = fluffy-switch
 	depends = python-pyqt5
 	depends = tk
 	optdepends = python-qdarkstyle: dark theme toggle in fluffy
-	backup = etc/udev/rules.d/80-fluffy-switch.rules
-	source = Fluffy-2.8.tar.gz::https://github.com/fourminute/Fluffy/archive/v2.8.tar.gz
-	sha256sums = bbab5cdc5b21186fd2d17bb4d2bcbfdd2e54c185db5977628f948be271beeaea
+	source = Fluffy-2.9.tar.gz::https://github.com/fourminute/Fluffy/archive/v2.9.tar.gz
+	sha256sums = c063bf746b944810ff3f34bd70efe8f6807713630f0cc4b98aec3350cde5e651
 
 pkgname = fluffy-switch
 
diff --git a/PKGBUILD b/PKGBUILD
index e278cf180022..b1b52b87e1ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: YoyPa <yoann dot p dot public at gmail dot com>
 pkgname=fluffy-switch
-pkgver=2.8
-pkgrel=2
-pkgdesc="Goldtree and Tinfoil GUI for USB install on switch"
+pkgver=2.9
+pkgrel=1
+pkgdesc="Goldtree and Tinfoil GUI for USB/Network install on switch"
 arch=('any')
 url="https://github.com/fourminute/Fluffy"
 license=('GPL')
@@ -15,23 +15,18 @@ depends=(
 optdepends=(
 	'python-qdarkstyle: dark theme toggle in fluffy'
 )
-backup=(
-	'etc/udev/rules.d/80-fluffy-switch.rules'
-)
 source=("Fluffy-${pkgver}.tar.gz::https://github.com/fourminute/Fluffy/archive/v${pkgver}.tar.gz")
-sha256sums=('bbab5cdc5b21186fd2d17bb4d2bcbfdd2e54c185db5977628f948be271beeaea')
+sha256sums=('c063bf746b944810ff3f34bd70efe8f6807713630f0cc4b98aec3350cde5e651')
 
-# Change .desktop file PATH from /tmp to ~/.config/fluffy (Make fluffy config file persistent)
+# Remove .desktop file PATH (/tmp).
 prepare() {
 	cd "Fluffy-${pkgver}"
-	sed -e "s|/tmp|$HOME/.config/fluffy|" -i linux/fluffy.desktop
+	sed -e "s|Path=\/tmp||" -i linux/fluffy.desktop
 }
 
 package() {
-	mkdir -p "${pkgdir}$HOME/.config/fluffy"
-	chown $USER:$(id -gn $USER) "${pkgdir}$HOME/.config/fluffy"
 	cd "Fluffy-${pkgver}"
-	install -Dm 644 linux/80-fluffy-switch.rules "${pkgdir}/etc/udev/rules.d/80-fluffy-switch.rules"
+	install -Dm 644 linux/80-fluffy-switch.rules "${pkgdir}/usr/lib/udev/rules.d/80-fluffy-switch.rules"
 	install -Dm 644 linux/fluffy.desktop "${pkgdir}/usr/share/applications/fluffy.desktop"
 	install -Dm 644 icons/16x16/fluffy.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/fluffy.png"
 	install -Dm 644 icons/24x24/fluffy.png "${pkgdir}/usr/share/icons/hicolor/24x24/apps/fluffy.png"