user/*: Modernise / fix syntax / deps / mark no-check where applicable

1 files changed, 5 insertions, 11 deletions

diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD
index bf7ed865c..19286ae5f 100644
--- a/user/lm_sensors/APKBUILD
+++ b/user/lm_sensors/APKBUILD
@@ -22,7 +22,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv
 builddir="$srcdir/$_pkgname-$_pkgver"
 
 prepare() {
-	cd "$builddir"
+	default_prepare
+
 	sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
 	# Respect LDFLAGS
 	sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
@@ -31,39 +32,32 @@ prepare() {
 
 	# do not check for libiconv in ldconfig cache
 	sed -i -e 's/^LIBICONV.*/LIBICONV ?=/' prog/sensors/Module.mk
-
-	default_prepare
 }
 
 build() {
-	cd "$builddir"
 	export CFLAGS="$CFLAGS -fno-stack-protector"
 	make PREFIX=/usr user
 }
 
 package() {
-	cd "$builddir"
 	make PROG_EXTRA:=sensord user_install \
 		PREFIX=/usr \
 		MANDIR=/usr/share/man \
 		DESTDIR="$pkgdir"
 
-	cd "$srcdir"
-	install -Dm755 fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
+	install -Dm755 "$srcdir"/fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
 }
 
 detect() {
 	depends="perl"
 	pkgdesc="Detection/migration scripts for lm_sensors"
 	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
-	cd "$pkgdir"
-	mv usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
-	mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
 }
 
 sensord() {
 	pkgdesc="sensord daemon"
-	cd "$builddir"
 	mkdir -p "$subpkgdir"/usr/sbin
 	mv "$pkgdir"/usr/sbin/sensord "$subpkgdir"/usr/sbin/sensord
 }