From 557f89c93ecd679a7bded1c5ecf1ca9086bfe039 Mon Sep 17 00:00:00 2001 From: mxmehl Date: Wed, 16 Feb 2022 10:46:58 +0100 Subject: [PATCH] fix shellcheck --- astroid/poll.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/astroid/poll.sh b/astroid/poll.sh index e1adf75..bf24f38 100755 --- a/astroid/poll.sh +++ b/astroid/poll.sh @@ -1,12 +1,14 @@ #!/bin/bash -start=`date +%s` +start=$(date +%s) CURDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TMP=/tmp/status -source "$TMP" +# Local status file that indicates whether offline mode is activated +# shellcheck source=/dev/null +source "/tmp/status" # If offline mode, do a quick sync +# shellcheck disable=SC2154 if [ "$var_conn" == "off" ]; then echo "[INFO] Offline mode enabled. Do a quick sync" offlineimap -q @@ -15,7 +17,7 @@ else offlineimap fi -sync=`date +%s` +sync=$(date +%s) # Index new mails which will be tagged with notmuch's new.tags echo "[DEBUG] Sync notmuch database with new mails" @@ -27,7 +29,7 @@ notmuch tag +inbox -- path:INBOX/** # Move selectedly tagged mails to folders if they are only in INBOX echo "[DEBUG] Move tagged mails in INBOX to folders (move-tag.sh)" -bash $CURDIR/scripts/move-tag.sh ${var_conn} +bash "$CURDIR"/scripts/move-tag.sh "${var_conn}" # Index again after mails have been moved echo "[DEBUG] Update notmuch database with possibly moved mails" @@ -48,8 +50,8 @@ notmuch tag +event -- tag:"/event.*/" # Automatic tagging based on location of mails in folders echo "[DEBUG] Tag mails based on their folder (tag-folder.sh)" -bash $CURDIR/scripts/tag-folder.sh # generates commands from tag-folder.csv -bash $CURDIR/scripts/tag-folder-rules.sh # executes generated commands +bash "$CURDIR"/scripts/tag-folder.sh # generates commands from tag-folder.csv +bash "$CURDIR"/scripts/tag-folder-rules.sh # executes generated commands # Mark mails in certain folders read echo "[DEBUG] Mark mails in trash folders read" @@ -60,5 +62,5 @@ notmuch tag -unread -- path:Trash.ignore-mod/** echo "[DEBUG] Remove the 'new' tag" notmuch tag -new -- tag:new -end=`date +%s` +end=$(date +%s) echo "[DEBUG] poll.sh exited after $((end-start))s ($((sync-start))s download)"