diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-24 22:04:28 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-03-24 22:04:28 +0100 |
| commit | 5898126ce1a61ca9b3330b34098c7aba6bc2f767 (patch) | |
| tree | 6827e56a61685f7df196736ae3d1b656d023bb0b | |
| parent | a415187647ae9bfaf0b140cebf753f3befbc5913 (diff) | |
| download | impressive-display-5898126ce1a61ca9b3330b34098c7aba6bc2f767.tar.gz impressive-display-5898126ce1a61ca9b3330b34098c7aba6bc2f767.tar.bz2 impressive-display-5898126ce1a61ca9b3330b34098c7aba6bc2f767.zip | |
Fix merging of portrait pages. The pdfnup tool drops its output file in the current working directory.
| -rwxr-xr-x | impressive-display/bin/impressive-display | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/impressive-display/bin/impressive-display b/impressive-display/bin/impressive-display index 951a015..67b0989 100755 --- a/impressive-display/bin/impressive-display +++ b/impressive-display/bin/impressive-display @@ -176,18 +176,26 @@ function pdf_is_portrait { fi } +function merge_portrait_documents { + if which pdfnup 1>/dev/null && pdf_is_portrait "$WORKDIR/impressive-pdffile.pdf"; then + cd $WORKDIR && pdfnup "$WORKDIR/impressive-pdffile.pdf" && cd - 1>/dev/null + mv "$WORKDIR/impressive-pdffile-nup.pdf" "$WORKDIR/impressive-pdffile-display.pdf" + else + mv "$WORKDIR/impressive-pdffile.pdf" "$WORKDIR/impressive-pdffile-display.pdf" + fi +} function download_pdffile { if [ -n "$PDF_URL_CREDS" ]; then creds="-u $PDF_URL_CREDS" fi - curl $creds "$PDF_URL" 1> impressive-pdffile.pdf 2>/dev/null + curl $creds "$PDF_URL" 1> "$WORKDIR/impressive-pdffile.pdf" 2>/dev/null + merge_portrait_documents } # do an initial PDF retrieval.. if [ -n "$PDF_URL" ]; then - cd $WORKDIR download_pdffile trap "stop_pdfdownload_loop" SIGINT SIGTERM ERR @@ -207,7 +215,7 @@ if [ -n "$PDF_URL" ]; then fi - pdffile=$WORKDIR/impressive-pdffile.pdf + pdffile="$WORKDIR/impressive-pdffile-display.pdf" elif [ -n "$PDF_FILE" ]; then @@ -221,17 +229,11 @@ elif [ -n "$PDF_FILE" ]; then fi mv $WORKDIR/$(basename $PDF_FILE) "$WORKDIR/impressive-pdffile.pdf" - pdffile="$WORKDIR/impressive-pdffile.pdf" + merge_portrait_documents -fi + pdffile="$WORKDIR/impressive-pdffile-display.pdf" -if which pdfnup 1>/dev/null && pdf_is_portrait "$WORKDIR/impressive-pdffile.pdf"; then - pdfnup "$WORKDIR/impressive-pdffile.pdf" 1>/dev/null 2>/dev/null - mv "$WORKDIR/impressive-pdffile-nup.pdf" "$WORKDIR/impressive-pdffile-display.pdf" -else - mv "$WORKDIR/impressive-pdffile.pdf" "$WORKDIR/impressive-pdffile-display.pdf" fi -pdffile="$WORKDIR/impressive-pdffile-display.pdf" if [ -n "$pdffile" ]; then |