From 9d660cd2e01745d613effddc4e157dee30b17ac2 Mon Sep 17 00:00:00 2001
From: ngn <ngn@ngn.tf>
Date: Wed, 14 Aug 2024 02:51:57 +0300
Subject: [PATCH] update: accountservice and aalib cleanup

---
 src/aalib/pkg.sh           | 13 ++++++++-----
 src/accountsservice/pkg.sh | 17 +++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/aalib/pkg.sh b/src/aalib/pkg.sh
index 11cb682..71c1560 100644
--- a/src/aalib/pkg.sh
+++ b/src/aalib/pkg.sh
@@ -1,13 +1,15 @@
 NAME="aalib"
 DESC="Library to render any graphic into ASCII Ar"
 VERSION="1.4rc5"
-FILES=("https://downloads.sourceforge.net/aa-project/aalib-$VERSION.tar.gz")
+
+FILES=("https://downloads.sourceforge.net/aa-project/aalib-${VERSION}.tar.gz")
 HASHES=("9801095c42bba12edebd1902bcf0a990")
+
 DEPENDS=("slang" "gpm" "mkfontscale" "fonts")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.gz
-  cd $NAME-1.4.0
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-1.4.0"
 
   sed -i -e '/AM_PATH_AALIB,/s/AM_PATH_AALIB/[&]/' aalib.m4
   ./configure --prefix=/usr           \
@@ -15,7 +17,8 @@ PACKAGE() {
             --mandir=/usr/share/man   \
             --with-ncurses=/usr       \
             --disable-static
-  make && make DESTDIR="$ROOTDIR" install
+  make
+  make DESTDIR="${ROOTDIR}" install
 
-  cd .. && rm -r $NAME-1.4.0
+  cd .. && rm -r "${NAME}-1.4.0"
 }
diff --git a/src/accountsservice/pkg.sh b/src/accountsservice/pkg.sh
index 2296041..a7db608 100644
--- a/src/accountsservice/pkg.sh
+++ b/src/accountsservice/pkg.sh
@@ -1,15 +1,15 @@
 NAME="accountsservice"
 DESC="Provides a set of D-Bus interfaces for querying and manipulating user account information"
 VERSION="23.13.9"
-FILES=("https://www.freedesktop.org/software/accountsservice/accountsservice-$VERSION.tar.xz")
+
+FILES=("https://www.freedesktop.org/software/accountsservice/accountsservice-${VERSION}.tar.xz")
 HASHES=("03dccfe1b306b7ca19743e86d118e64d")
-DEPENDS=(
-  "polkit" "gobject-introspection" 
-)
+
+DEPENDS=("polkit" "gobject-introspection")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
 
   mv tests/dbusmock{,-tests}
   sed -e '/accounts_service\.py/s/dbusmock/dbusmock-tests/' \
@@ -22,7 +22,8 @@ PACKAGE() {
       --prefix=/usr       \
       --buildtype=release \
       -Dadmin_group=adm 
-  ninja && DESTDIR="$ROOTDIR" ninja install
+  ninja
+  DESTDIR="${ROOTDIR}" ninja install
 
-  cd ../.. && rm -r $NAME-$VERSION
+  cd ../.. && rm -r "${NAME}-${VERSION}"
 }