From bfb869816713ee2d635220b803cd8eb89f4cf444 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Sat, 8 Jun 2013 14:29:01 -0600
Subject: libreblacklist: fix a few bugs

 - set -e didn't work in blacklist-update when followed by ||
 - it prompted before overwriting the local blacklist
---
 src/lib/libreblacklist | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/lib/libreblacklist')

diff --git a/src/lib/libreblacklist b/src/lib/libreblacklist
index 5cfb410..fb8b43a 100755
--- a/src/lib/libreblacklist
+++ b/src/lib/libreblacklist
@@ -40,10 +40,9 @@ blacklist-cat() {
 # Usage: blacklist-update
 # Updates (or creates) the cached copy of the blacklist
 blacklist-update() (
-	set -euE # allow it to not be set globally
 	. libremessages
-	load_files libretools
-	check_vars libretools BLACKLIST
+	load_files libretools || return 1
+	check_vars libretools BLACKLIST || return 1
 
 	local remote_blacklist="$BLACKLIST"
 	local local_blacklist="$XDG_CACHE_HOME/libretools/blacklist.txt"
@@ -53,7 +52,7 @@ blacklist-update() (
 	mkdir -p "${local_blacklist%/*}"
 	if wget -N -q -O "${local_blacklist}.part" "$remote_blacklist" 2>/dev/null; then
 		stat_done
-		mv "${local_blacklist}.part" "$local_blacklist"
+		mv -f "${local_blacklist}.part" "$local_blacklist"
 	else
 		stat_done
 		rm "${local_blacklist}.part"
-- 
cgit v1.2.2