Changed tumblr url location and fixed tweetread multi-url handling

Author: Isaac G

tumblr

@@ -3,7 +3,7 @@
 c="${1:- 0}"
 
 urls=$(
-	grep 'http.*tumblr' /mnt/sda1/urls.txt \
+	grep 'http.*tumblr' /mnt/sda1/tumblr.urls \
 	| sed 's/ .*//' | sed "s/^/'/;s/\$/'/" \
 	| tr '\n' ',' | sed 's/,$//'
 )
@@ -15,6 +15,7 @@ urls=$(
 		titles+=("$title")
 	done
 
+	unset TMOUT
 	pause=20
 	for ((; c < ${#urls[@]}; c++)) ; do
 		i="${urls[c]}"
@@ -41,4 +42,4 @@ urls=$(
 		firefox -new-tab "$i"
 	done
 } 3< <( printf ".separator ' |'\nSELECT i.url,f.title,i.title FROM rss_item AS i JOIN rss_feed AS f ON i.feedurl = f.rssurl WHERE unread = 1 AND deleted = 0 AND feedurl IN (%s) ORDER BY   pubDate ASC;" "$urls" \
-| sqlite3 /mnt/sda1/newsbeuter.cache.db )
+| sqlite3 /mnt/sda1/tumblr.cache.db )

tweetread

@@ -47,14 +47,14 @@ print () {
 	printf "%s%d/%d %s%s%s\n" "$_red" $((index+1)) $max "$color" "${lines[index]}" "$_def"
 
 	# Find all URLs and xclip them
-	urls=""
+	urls=()
 	for word in ${lines[index]} ; do 
 		! [[ $word = http* || $word = www* ]] && continue
-		[[ $urls ]] && urls="$urls|$word" || urls="$word"
+		urls+=("$word")
 	done
 	[[ $urls ]] && { 
-		xclip -i <<< "$urls"
-		printf "%s URL copied: %s%s\n" "$_magenta" "$urls" "$_def"
+		xclip -i <<< "${urls[@]}"
+		for i in "${urls[@]}" ; do printf "%s URL copied: %s%s\n" "$_magenta" "$i" "$_def" ; done
 	}
 
 	(( ${#save[@]} )) && printf "%d saved items" ${#save[@]}
@@ -94,7 +94,7 @@ while read -sN1 ; do
 			print
 			;;
 		[of]) # Open with ff
-			firefox "$urls"
+			for i in "${urls[@]}" ; do firefox "$i" ; done
 			((index < max - 1 && index++)) # Advance to next item on save
 			print
 			;;