Do not use verbose logging by default, and clean up package standards

3 files changed, 31 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fae9b06447b9..b7ee9e6c1a67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fanctl-git
-	pkgdesc = fanctl is a replacement for fancontrol from lm_sensors meant to have a more fine-grained control interface in its config file
-	pkgver = 0.4.1.r0.05737f6
-	pkgrel = 1
+	pkgdesc = Replacement for fancontrol with more approachable and powerful config interface
+	pkgver = 0.5.1.r2.578f7d1
+	pkgrel = 3
 	url = https://gitlab.com/mcoffin/fanctl
 	arch = x86_64
 	license = GPL3
@@ -12,7 +12,6 @@ pkgbase = fanctl-git
 	source = fanctl::git+https://gitlab.com/mcoffin/fanctl.git#branch=master
 	source = fanctl.service
 	sha512sums = SKIP
-	sha512sums = 7aab4bdec106c131f20f78bb150e4f6b2875fede6cef3ffbe164279f2f2b35aeabc0c81b7375e4eee4513acb9a0cc7ce43edb1492b27275dd63d520de26a6d69
+	sha512sums = 973eb426edc2b6cb452bb4b241d78b31573baf215a530fe936847a6910c82c5f38e19ffe521c95d6c56c55e25142e03d4617f7ed25b82165dd857fabc8dc9ae6
 
 pkgname = fanctl-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 4ba02a180b9a..3e3ba24e754a 100644..100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Matt Coffin <mcoffin13@gmail.com>
 pkgname=fanctl-git
-pkgver=0.4.1.r0.05737f6
-pkgrel=1
-pkgdesc="fanctl is a replacement for fancontrol from lm_sensors meant to have a more fine-grained control interface in its config file"
+pkgver=0.5.1.r2.578f7d1
+pkgrel=3
+pkgdesc="Replacement for fancontrol with more approachable and powerful config interface"
 arch=('x86_64')
 url="https://gitlab.com/mcoffin/fanctl"
 license=('GPL3')
@@ -19,26 +19,40 @@ source=('fanctl::git+https://gitlab.com/mcoffin/fanctl.git#branch=master'
         fanctl.service)
 noextract=()
 sha512sums=('SKIP'
-            '7aab4bdec106c131f20f78bb150e4f6b2875fede6cef3ffbe164279f2f2b35aeabc0c81b7375e4eee4513acb9a0cc7ce43edb1492b27275dd63d520de26a6d69')
+            '973eb426edc2b6cb452bb4b241d78b31573baf215a530fe936847a6910c82c5f38e19ffe521c95d6c56c55e25142e03d4617f7ed25b82165dd857fabc8dc9ae6')
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
-	printf "%s" "$((git get-version -a -v 2>/dev/null || git describe --long) | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+
+	# legacy
+	# printf "%s" "$((git get-version -a -v 2>/dev/null || git describe --long) | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+
+	# Git, tags available
+	# printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+
+	# Git, no tags available
+	# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+
+	# Git, tags available (mcoffin edits to remove "v" prefix used in git tags
+	local _tmpver="$(printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')")"
+	echo -e "${_tmpver#v}"
 }
 
 build() {
 	cd "$srcdir/${pkgname%-git}"
-	cargo build --release
+	env CARGO_INCREMENTAL=0 \
+		cargo build --release --locked
 }
 
 package() {
 	cd "$srcdir/${pkgname%-git}"
-	cargo install --path . --root "$pkgdir/usr" --bins
-	for f in "$pkgdir/usr/"{.crates.toml,.crates2.json}; do
-		if [ -e $f ]; then
-			rm $f
-		fi
-	done
+	# cargo install --path . --root "$pkgdir/usr" --bins
+	# for f in "$pkgdir/usr/"{.crates.toml,.crates2.json}; do
+	# 	if [ -e $f ]; then
+	# 		rm $f
+	# 	fi
+	# done
+	install -D -m 755 -t "$pkgdir/usr/bin" target/release/fanctl
 	install -D -m 644 -t "$pkgdir/usr/share/licenses/$pkgname" ./COPYING
 	install -D -m 644 fanctl.yml "$pkgdir/usr/share/fanctl.example.yml"
 	install -D -m 644 -t "$pkgdir/usr/lib/systemd/system" "$srcdir/fanctl.service"
diff --git a/fanctl.service b/fanctl.service
index 0ac6fb0fdcf4..58e3936145d9 100644
--- a/fanctl.service
+++ b/fanctl.service
@@ -2,7 +2,7 @@
 Description=fanctl fan controller
 
 [Service]
-Environment=RUST_LOG=fanctl=trace
+Environment=RUST_LOG=fanctl=info
 ExecStart=/usr/bin/fanctl -c /etc/fanctl.yml
 
 [Install]