no ping printout

This commit is contained in:
Alexander Bocken 2021-06-16 18:36:39 +02:00
parent 7623b91a31
commit 1272a80ae0
Signed by: Alexander
GPG Key ID: 1D237BE83F9B05E8

View File

@ -45,7 +45,7 @@ scan(){
done done
#Create lock file to stop override of URLFILE while scanning #Create lock file to stop override of URLFILE while scanning
touch /tmp/threadwatcher.lock touch /tmp/threadwatcher.lock
ping -q -c 1 4channel.org || { echo "Cannot connect to 4chan."; exit 1;} ping -q -c 1 4channel.org > /dev/null|| { echo "Cannot connect to 4chan."; exit 1;}
if [ "$(wc -l < "$URLFILE")" -gt 0 ]; then if [ "$(wc -l < "$URLFILE")" -gt 0 ]; then
echo "scanning threads..." echo "scanning threads..."
else else
@ -65,7 +65,7 @@ scan(){
echo "$url ($thread_title) $(echo "$dl_location" | sed "s|$HOME|~|")" echo "$url ($thread_title) $(echo "$dl_location" | sed "s|$HOME|~|")"
if [ -z "$(</tmp/content$$)" ]; then if [ -z "$(</tmp/content$$)" ]; then
#check for internet again, in case something has changed during the download process #check for internet again, in case something has changed during the download process
if ping -q -c 1 4channel.org >/dev/null if ping -q -c 1 4channel.org > /dev/null
then then
echo "Thread $url not found ($dl_location) deleting from cached list of threads to watch" echo "Thread $url not found ($dl_location) deleting from cached list of threads to watch"
notify-send "threadwatcher" "Thread downloading to $(echo "$dl_location" | sed "s|$HOME|~|") is complete now." notify-send "threadwatcher" "Thread downloading to $(echo "$dl_location" | sed "s|$HOME|~|") is complete now."
@ -136,7 +136,7 @@ dl_location="$(makepathabsolute "$2")"
fi fi
## Move already downloaded files to new location ## Move already downloaded files to new location
ping -q -c 1 1.1.1.1 > /dev/null || ping -q -c 1 1.0.0.1 > /dev/null || ping -q -c 1 4channel.org || { echo "No internet connection detected."; exit ;} ping -q -c 1 1.1.1.1 > /dev/null || ping -q -c 1 1.0.0.1 > /dev/null || ping -q -c 1 4channel.org > /dev/null || { echo "No internet connection detected."; exit ;}
mkdir -p "$new_location" mkdir -p "$new_location"
url="$1" url="$1"
json_url="$(echo "$url" | sed -E 's/boards\.(4chan|4channel)/a.4cdn/; s/$/.json/')" json_url="$(echo "$url" | sed -E 's/boards\.(4chan|4channel)/a.4cdn/; s/$/.json/')"