--- tools/any2djvu.orig Sat Feb 17 02:33:06 2007 +++ tools/any2djvu Sat Feb 17 02:36:10 2007 @@ -1,11 +1,11 @@ -#! /bin/bash -f +#!/bin/sh # CVS version control block - do not edit manually # $RCSfile: any2djvu,v $ # $Revision: 1.1 $ # $Date: 2005/08/23 15:53:01 $ # $Source: /cvsroot/djvu/djvulibre-3.5/tools/any2djvu,v $ -function copyright() +copyright() { echo "Copyright (C) 2002 David Kreil " echo "Modified by Barak A. Pearlmutter " @@ -14,7 +14,7 @@ echo "Released under the GNU GPL v2, 21-Oct-2002." } -function warranty() +warranty() { echo "This program is distributed in the hope that it will be useful," echo "but WITHOUT ANY WARRANTY; without even the implied warranty of" @@ -22,7 +22,7 @@ echo "GNU General Public License for more details." } -function disclaimer() +disclaimer() { echo "By using this tool you accept the following disclaimer:" echo " Because the any2djvu service is free of charge, there is no" @@ -40,7 +40,7 @@ ocr=1 docformat=2 -function warn() +warn() { echo "Notes:" echo " - Internet connection is required." @@ -53,7 +53,7 @@ echo " - This software comes with NO WARRANTY." } -function format_help() +format_help() { echo "Codes for the formats of the input documents to use with -f" echo " 1 - DjVu Document (for verification or OCR)" @@ -67,7 +67,7 @@ echo " 9 - Scanned Document - Color/Mixed - >400 dpi" } -function usage() +usage() { echo "Convert files from .ps/.ps.gz/.pdf to .djvu" echo "Usage: $0 [options] [url] {filename(s)}" @@ -121,13 +121,13 @@ fi # check OCR option -if [ ! x$ocr == x0 ] && [ ! x$ocr == x1 ]; then +if [ ! x$ocr = x0 ] && [ ! x$ocr = x1 ]; then echo 'error: -o OCR must be 0 or 1' exit 2 fi # if help is requested or docformat is not specified right - show help -if [ x$docformat == x'help' ]; then +if [ x$docformat = x'help' ]; then format_help exit 0 fi @@ -190,7 +190,7 @@ -F ocr=$ocr -F legal=1 $rurl/$rcgi \ | eval tee $log $shellopts else - wget $wgetopts -O - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts" \ + /usr/bin/fetch $wgetopts -o - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts" \ | eval tee $log $shellopts fi l=`egrep 'href=djvu/.*\.djvu' $log` @@ -200,7 +200,7 @@ echo "error: something got wrong. check log file" exit 1 fi - wget $wgetopts -O $b.djvu "$rurl/$l" + /usr/bin/fetch $wgetopts -o $b.djvu "$rurl/$l" [ -z $doclean ] || rm $log [ -z $silent ] && ls -l $b.djvu