From c4952aad8f29304bceba061f60b71a16dd3f3a77 Mon Sep 17 00:00:00 2001
From: Ohad Livne <libohad-dev@proton.me>
Date: Wed, 4 Jun 2025 22:46:01 +0300
Subject: [PATCH] Fix linting issues in scripts

---
 .config/setup/01-install-packages.sh | 2 ++
 .local/bin/.wifi-wizard              | 8 +++++---
 .local/bin/git-resign                | 2 +-
 .local/bin/make-backup               | 2 +-
 .local/bin/package-alert             | 8 ++++----
 .local/bin/print-status              | 4 ++--
 .local/bin/take-screenshot           | 4 ++--
 7 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.config/setup/01-install-packages.sh b/.config/setup/01-install-packages.sh
index 5c976be..efc3124 100755
--- a/.config/setup/01-install-packages.sh
+++ b/.config/setup/01-install-packages.sh
@@ -64,5 +64,7 @@ META_PKGS="\
 fonts-noto \
 "
 
+# shellcheck disable=SC2086
 sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ${DEB_PKGS}
+# shellcheck disable=SC2086
 sudo DEBIAN_FRONTEND=noninteractive apt-get install --install-recommends --yes ${META_PKGS}
diff --git a/.local/bin/.wifi-wizard b/.local/bin/.wifi-wizard
index 65b1505..48e8f8e 100755
--- a/.local/bin/.wifi-wizard
+++ b/.local/bin/.wifi-wizard
@@ -1,13 +1,15 @@
 #! /usr/bin/sh
 
 ssid=$(nmcli --fields SSID,RATE,SIGNAL,BARS device wifi list | fuzzel --dmenu --width 40 | awk '{print $1}')
+retval=$?
 if [ -z "${ssid}" ]; then
-    exit $?
+    exit $retval
 fi
 
 password=$(fuzzel --dmenu --password)
-if [ $? -ne 0 ]; then
-    exit $?
+retval=$?
+if [ $retval -ne 0 ]; then
+    exit $retval
 fi
 
 nmcli device wifi connect "${ssid}" password "${password}"
diff --git a/.local/bin/git-resign b/.local/bin/git-resign
index 6dc0661..90a7a05 100755
--- a/.local/bin/git-resign
+++ b/.local/bin/git-resign
@@ -1,7 +1,7 @@
 #! /usr/bin/sh
 
 rebase_marker="$(git rev-parse --show-toplevel)/.git/rebase-merge/done"
-while [ -f ${rebase_marker} ]
+while [ -f "${rebase_marker}" ]
 do
     git sign
     git rebase --continue
diff --git a/.local/bin/make-backup b/.local/bin/make-backup
index cf9262f..b18bb88 100755
--- a/.local/bin/make-backup
+++ b/.local/bin/make-backup
@@ -13,7 +13,7 @@ backup () {
 
     if "${HOME}/.local/bin/dirtree-changed" --directory "${directory}" --check-file "${TS_DIR}/${target}"
     then
-        borg create --compression auto,lzma ::"${target}"-{now} "${directory}"
+        borg create --compression auto,lzma ::"${target}"-\{now\} "${directory}"
         touch "${TS_DIR}/${target}"
     fi
 }
diff --git a/.local/bin/package-alert b/.local/bin/package-alert
index f58f84f..dee9127 100755
--- a/.local/bin/package-alert
+++ b/.local/bin/package-alert
@@ -5,17 +5,17 @@ WATCHLIST=~/.local/share/package-alert/watchlist
 agg_results=""
 
 if [ -f "${WATCHLIST}" ]; then
-    for pattern in $(cat "${WATCHLIST}"); do
+    while read -r pattern; do
         pat_results=$(apt-cache search --names-only "${pattern}")
-        if [ ! -z "${pat_results}" ]; then
+        if [ -n "${pat_results}" ]; then
             agg_results="${agg_results:+${agg_results}
 }Packages matching \"${pattern}\":
 ${pat_results}
 "
         fi
-    done
+    done < "${WATCHLIST}"
 fi
 
-if [ ! -z "${agg_results}" ]; then
+if [ -n "${agg_results}" ]; then
     printf '%s' "${agg_results}" | /usr/sbin/sendmail "${USER}"
 fi
diff --git a/.local/bin/print-status b/.local/bin/print-status
index 63a2f94..d6fc43b 100755
--- a/.local/bin/print-status
+++ b/.local/bin/print-status
@@ -19,7 +19,7 @@ today=$(date +'%Y-%m-%d')
 now=$(date +'%H:%M:%S')
 hour=$(echo "${now}" | cut -d: -f1 -)
 minute=$(echo "${now}" | cut -d: -f2 -)
-if [ "${minute}" \< "30" ]; then
+if [ "${minute}" -lt 30 ]; then
     case "${hour}" in
         "00"|"12") clock_face="🕛";;
         "01"|"13") clock_face="🕐";;
@@ -84,4 +84,4 @@ case "${battery_state}" in
         ;;
 esac
 
-echo ${recs} 🕹️${touchpad_active} 📆${today} ${clock_face}${now} ${audio_symbol}${audio_volume}% ${battery_symbol}${battery}%
+echo "${recs} 🕹️${touchpad_active} 📆${today} ${clock_face}${now} ${audio_symbol}${audio_volume}% ${battery_symbol}${battery}%"
diff --git a/.local/bin/take-screenshot b/.local/bin/take-screenshot
index f4de231..a586a10 100755
--- a/.local/bin/take-screenshot
+++ b/.local/bin/take-screenshot
@@ -20,11 +20,11 @@ ts() {
 }
 
 screenshot_filename() {
-    echo ~/Pictures/screenshots/screenshot-$(ts).png
+    echo ~/Pictures/screenshots/screenshot-"$(ts)".png
 }
 
 recording_filename() {
-    echo ~/Pictures/screenshots/recording-$(ts).mp4
+    echo ~/Pictures/screenshots/recording-"$(ts)".mp4
 }
 
 if [ -z "$1" ]; then