fix up shellcheck issues

oklopfer · Nov 29, 2023 · a15d4b7 · a15d4b7
1 parent 6eb74ad
commit a15d4b7
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,7 +20,7 @@ repos:
     hooks:
       - id: shellcheck
         types: []
-        args: ["-o", "all", "-e", "2148", "-e", "SC2033", "-e", "SC2032", "-e", "SC2034", "-e", "SC2154", "-e", "SC2312", "-e", "SC2164"]
+        args: ["-o", "all", "-e", "2148", "-e", "SC2033", "-e", "SC2032", "-e", "SC2034", "-e", "SC2154", "-e", "SC2312", "-e", "SC2164", "-e", "SC2143", "-e", "SC2103"]
         files: '^.*\.(pacscript|sh)$'
   - repo: https://github.com/maxwinterstein/shfmt-py
     rev: v3.4.3.1

diff --git a/packages/ananicy-cpp/ananicy-cpp.pacscript b/packages/ananicy-cpp/ananicy-cpp.pacscript
@@ -12,7 +12,7 @@ build() {
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DENABLE_SYSTEMD=ON \
-    -DVERSION=${pkgver}
+    -DVERSION="${pkgver}"
   cmake --build build --target ananicy-cpp --parallel "${NCPU}"
 }
 

diff --git a/packages/docker-bin/docker-bin.pacscript b/packages/docker-bin/docker-bin.pacscript
@@ -23,6 +23,7 @@ build() {
 
 package() {
   sudo cp -r "../${gives}"/* -t "${pkgdir}/usr/bin"
+  # shellcheck disable=SC2016
   echo '[Unit]
 Description=Docker Application Container Engine
 Documentation=https://docs.docker.com
@@ -116,7 +117,7 @@ post_install() {
 post_remove() {
   if [[ -f /bin/systemctl ]]; then
     for i in multi-user.target.wants/containerd.service multi-user.target.wants/docker.service sockets.target.wants/docker.socket; do
-      sudo rm /etc/systemd/system/${i} && echo "Removed /etc/systemd/system/${i}."
+      sudo rm /etc/systemd/system/"${i}" && echo "Removed /etc/systemd/system/${i}."
     done
   fi
 }
diff --git a/packages/keepassxc/keepassxc.pacscript b/packages/keepassxc/keepassxc.pacscript
@@ -20,7 +20,7 @@ build() {
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DWITH_XC_ALL=ON \
     -DWITH_XC_UPDATECHECK=OFF
-  cmake --build build --parallel ${NCPU}
+  cmake --build build --parallel "${NCPU}"
 }
 
 package() {

diff --git a/packages/st-lukesmith-git/st-lukesmith-git.pacscript b/packages/st-lukesmith-git/st-lukesmith-git.pacscript
@@ -6,7 +6,7 @@ license="MIT"
 makedepends=("make" "libharfbuzz-bin" "libxft-dev" "libpango1.0-dev")
 depends=("fontconfig")
 pkgver() {
-  git ls-remote ${url} master | cut -f1 | cut -c1-8
+  git ls-remote "${url}" master | cut -f1 | cut -c1-8
 }
 
 package() {

diff --git a/packages/tela-circle-icon-theme/tela-circle-icon-theme.pacscript b/packages/tela-circle-icon-theme/tela-circle-icon-theme.pacscript
@@ -22,5 +22,5 @@ package() {
 }
 
 post_install() {
-  ./usr/share/${name}/install.sh -c -a
+  ./usr/share/"${name}"/install.sh -c -a
 }
diff --git a/packages/tenacity-git/tenacity-git.pacscript b/packages/tenacity-git/tenacity-git.pacscript
@@ -14,6 +14,9 @@ case "${codename}" in
   lunar)
     depends+=("libavcodec59" "libavformat59" "libavutil57" "libflac++10" "libflac8" "libportsmf0v5" "libwxbase3.2-0" "libwxgtk3.2-0")
     ;;
+  *)
+    depends+=("libavcodec60" "libavformat60" "libavutil58" "libflac++10" "libflac12" "libportsmf0v5" "libwxbase3.2-1" "libwxgtk3.2-1")
+    ;;
 esac
 replace=("audacity")
 pkgdesc="FLOSS Audacity Fork. No telemetry, crash reports and other shenanigans like that!"