Alexander/threadwatcher
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix DBUS_SESSION_BUS_ADDRESS + various plural fixes

Browse Source
This commit is contained in:
Alexander Bocken 2021-10-28 16:57:54 +02:00
parent 6a3b13d93b
commit 517aada501
Signed by: Alexander
GPG Key ID: 1D237BE83F9B05E8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
threadwatcher
View File

@ -18,8 +18,8 @@ TMP_URLFILE=/tmp/4chan_thread_watcher_tmp$$
[ -f "$URLFILE" ] || touch "$URLFILE" [ -f "$URLFILE" ] || touch "$URLFILE"
#Cronjob Notifications #Cronjob Notifications
DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus #To reliably get threadwatcher notifications use cronjobs like this:
export DBUS_SESSION_BUS_ADDRESS #env DBUS_SESSION_BUS_ADDRESS=your-address /usr/bin/threadwatcher scan
export DISPLAY=:0.0 export DISPLAY=:0.0
help="threadwatcher [add URL DL_LOCATION] [list] [edit] [clean] [help] help="threadwatcher [add URL DL_LOCATION] [list] [edit] [clean] [help]
@ -96,7 +96,8 @@ scan(){
if [ "$AUTOPRUNE" = "true" ]; then if [ "$AUTOPRUNE" = "true" ]; then
echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch" echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
notify-send "threadwatcher" "Thread downloading to $(echo "$dl_location" | sed "s|$HOME|~|") is complete now." simplified_loc="$(echo "$dl_location" | sed "s|$HOME|~|")"
notify-send "threadwatcher" "Thread downloading to $simplified_loc is complete now."
fi fi
else else
echo "Cannot connect to 4chan." echo "Cannot connect to 4chan."
@ -183,7 +184,8 @@ prune(){
then then
echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch" echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
notify-send "threadwatcher" "Thread downloading to $(echo "$dl_location" | sed "s|$HOME|~|") is complete now." simplified_loc="$(echo "$dl_location" | sed "s|$HOME|~|")"
notify-send "threadwatcher" "Thread downloading to $simplified_loc is complete now."
else else
echo "Cannot connect to 4chan." echo "Cannot connect to 4chan."
cleanup && exit 1 cleanup && exit 1
@ -224,7 +226,9 @@ dedupe(){
while read -r file; do while read -r file; do
rm -v "$file" | sed 's/^removed/[-]/' | tr -d "'" rm -v "$file" | sed 's/^removed/[-]/' | tr -d "'"
done done
echo "$(echo "$duplicates" | wc -l) duplicate files have been deleted in $dir" n="$(echo "$duplicates" | wc -l)"
[ "$n" -gt 1 ] && adjustment="s have" || adjustment=" has"
echo "$n duplicate file$adjustment been deleted in $dir"
fi fi
done done
} }