rebase: clean local_pdffile function

1 files changed, 7 insertions, 22 deletions

diff --git a/bin/impressive-display b/bin/impressive-display
index e0b243d..d7a8720 100755
--- a/bin/impressive-display
+++ b/bin/impressive-display
@@ -257,20 +257,6 @@ function merge_portrait_documents {
 
 }
 
-function local_pdffile {
-
-	cp $PDF_FILE $workdir/$(basename $PDF_FILE)
-
-	# is the PDF file gzipped?
-	if echo $(basename $PDF_FILE) | grep -E ".*\.gz"; then
-		PDF_FILE=${PDF_FILE/.gz/}
-		gunzip $workdir/$(basename $PDF_FILE).gz
-	fi
-	mv $workdir/$(basename $PDF_FILE) "$pdffile_downloaded"
-
-	merge_portrait_documents
-
-}
 
 function is_rush_hour {
 
@@ -340,8 +326,13 @@ function download_pdffile {
 	fi
 	curl $creds "$PDF_URI" 1> "$pdffile_downloaded" 2>/dev/null
 
-	if pdfinfo "$pdffile_downloaded" 1>/dev/null 2>/dev/null; then
+	# is the PDF file gzipped?
+	if echo $(basename $pdffile_downloaded) | grep -E ".*\.gz"; then
+		pdffile_downloaded=${pdffile_downloaded/.gz/}
+		gunzip $workdir/$(basename $pdffile_downloaded).gz
+	fi
 
+	if pdfinfo "$pdffile_downloaded" 1>/dev/null 2>/dev/null; then
 		merge_portrait_documents
 
 		cmp -s  "$pdffile_downloaded" "$pdffile_previous"> /dev/null
@@ -456,15 +447,9 @@ if [ -n "$PDF_URI" ]; then
 	create_lock
 	download_loop
 
-elif [ -n "$PDF_FILE" ]; then
-
-	$OUTPUT "INFO: PDF_FILE is configured. Using local PDF file: $PDF_FILE"
-	create_lock
-	local_pdffile
-
 else
 
-	$OUTPUT "ERROR: Neither PDF_FILE nor PDF_URI has been configured. Doing nothing. Maybe you're using Dash instead of Bash?"
+	$OUTPUT "ERROR: PDF_URI hasn't been configured. Doing nothing. Maybe you're using Dash instead of Bash?"
 	exit 0
 
 fi