Attachment #176591 for bug #252734

View | Details | Raw Unified | Return to bug 252734
Collapse All | Expand All




++ scripts/pdf90

for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
do if test -f $d/pdfnup.conf; then
   echo "Reading site configuration from $d/pdfnup.conf"
   . $d/pdfnup.conf
   fi 
done
if test -f ~/.pdfnup.conf; then 
   echo "Reading user defaults from ~/.pdfnup.conf";
   . ~/.pdfnup.conf; 
fi
#######################################################################
##

##
##  Check that necessary LaTeX packages are installed
##
modifyPath="${pdflatex%/*}"
[ -n "$modifyPath" ] && export PATH="$modifyPath:$PATH"
case `kpsewhich pdfpages.sty` in
	"") echo "pdf90: pdfpages.sty not installed"; exit 1;;
esac

##
##  That's the arguments done.
##

mkTempDir=''
trap 'test -n "$mkTempDir" && test -d "$mkTempDir" && \
	rm -rf -- "$mkTempDir" && mkTempDir=""; \
	trap - EXIT HUP INT TERM' EXIT HUP INT TERM
if ! command -v mktemp >/dev/null 2>&1 || \
	! mkTempDir=`mktemp -d -- "$tempfileDir/pdf90.XXXXXX"`
then
	echo "pdf90: cannot create temporary directory"
	exit 2
fi
tempfileDir=$mkTempDir

##
##  Now work on the input file (or files in turn)
##
++ scripts/pdfjoin

for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
do if test -f $d/pdfnup.conf; then
   echo "Reading site configuration from $d/pdfnup.conf"
   . $d/pdfnup.conf
   fi 
done
if test -f ~/.pdfnup.conf; then 
   echo "Reading user defaults from ~/.pdfnup.conf";
   . ~/.pdfnup.conf; 
fi
#######################################################################
##

##
##  Check that necessary LaTeX packages are installed
##
modifyPath="${pdflatex%/*}"
[ -n "$modifyPath" ] && export PATH="$modifyPath:$PATH"
case `kpsewhich pdfpages.sty` in
	"") echo "pdfjoin: pdfpages.sty not installed"; exit 1;;
esac

##
##  That's the arguments done.
##

mkTempDir=''
trap 'test -n "$mkTempDir" && test -d "$mkTempDir" && \
	rm -rf -- "$mkTempDir" && mkTempDir=""; \
	trap - EXIT HUP INT TERM' EXIT HUP INT TERM
if ! command -v mktemp >/dev/null 2>&1 || \
	! mkTempDir=`mktemp -d -- "$tempfileDir/pdfjoin.XXXXXX"`
then
	echo "pdfjoin: cannot create temporary directory"
	exit 2
fi
tempfileDir=$mkTempDir

##
##  Now work on the input files
##
++ scripts/pdfnup

for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
do if test -f $d/pdfnup.conf; then
     echo "Reading site configuration from $d/pdfnup.conf"
     . $d/pdfnup.conf
   fi 
done
if test -f ~/.pdfnup.conf; then 
   echo "Reading user defaults from ~/.pdfnup.conf";
   . ~/.pdfnup.conf; 
fi
#######################################################################
##

##
##  Check that necessary LaTeX packages are installed
##
modifyPath="${pdflatex%/*}"
[ -n "$modifyPath" ] && export PATH="$modifyPath:$PATH"
case `kpsewhich pdfpages.sty` in
	"") echo "pdfnup: pdfpages.sty not installed"; exit 1;;
esac

##
##  That's the arguments done.
##

mkTempDir=''
trap 'test -n "$mkTempDir" && test -d "$mkTempDir" && \
	rm -rf -- "$mkTempDir" && mkTempDir=""; \
	trap - EXIT HUP INT TERM' EXIT HUP INT TERM
if ! command -v mktemp >/dev/null 2>&1 || \
	! mkTempDir=`mktemp -d -- "$tempfileDir/pdfnup.XXXXXX"`
then
	echo "pdfnup: cannot create temporary directory"
	exit 2
fi
tempfileDir=$mkTempDir

##
##  Next sort out paper orientation, if not specified
##
x=`echo $nup | sed 's/..$//'`

Return to bug 252734

Line Link Here

(-)file_not_specified_in_diff (-15 / +55 lines)
0	-- scripts/pdf90	0	++ scripts/pdf90
Lines 43-54 Link Here
43	for d in /etc /usr/share/etc /usr/local/share /usr/local/etc	43	for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
44	do if test -f $d/pdfnup.conf; then	44	do if test -f $d/pdfnup.conf; then
45	echo "Reading site configuration from $d/pdfnup.conf"	45	echo "Reading site configuration from $d/pdfnup.conf"
46	source $d/pdfnup.conf	46	. $d/pdfnup.conf
47	fi	47	fi
48	done	48	done
49	if test -f ~/.pdfnup.conf; then	49	if test -f ~/.pdfnup.conf; then
50	echo "Reading user defaults from ~/.pdfnup.conf";	50	echo "Reading user defaults from ~/.pdfnup.conf";
51	source ~/.pdfnup.conf;	51	. ~/.pdfnup.conf;
52	fi	52	fi
53	#######################################################################	53	#######################################################################
54	##	54	##
Lines 71-78 Link Here
71	##	71	##
72	## Check that necessary LaTeX packages are installed	72	## Check that necessary LaTeX packages are installed
73	##	73	##
74	PATH=`dirname "$pdflatex"`:$PATH	74	modifyPath="${pdflatex%/*}"
75	export PATH	75	[ -n "$modifyPath" ] && export PATH="$modifyPath:$PATH"
76	case `kpsewhich pdfpages.sty` in	76	case `kpsewhich pdfpages.sty` in
77	"") echo "pdf90: pdfpages.sty not installed"; exit 1;;	77	"") echo "pdf90: pdfpages.sty not installed"; exit 1;;
78	esac	78	esac
Lines 136-141 Link Here
136	##	136	##
137	## That's the arguments done.	137	## That's the arguments done.
138	##	138	##
		139
		140	mkTempDir=''
		141	trap 'test -n "$mkTempDir" && test -d "$mkTempDir" && \
		142	rm -rf -- "$mkTempDir" && mkTempDir=""; \
		143	trap - EXIT HUP INT TERM' EXIT HUP INT TERM
		144	if ! command -v mktemp >/dev/null 2>&1 \|\| \
		145	! mkTempDir=`mktemp -d -- "$tempfileDir/pdf90.XXXXXX"`
		146	then
		147	echo "pdf90: cannot create temporary directory"
		148	exit 2
		149	fi
		150	tempfileDir=$mkTempDir
		151
139	##	152	##
140	## Now work on the input file (or files in turn)	153	## Now work on the input file (or files in turn)
141	##	154	##
142	-- scripts/pdfjoin	155	++ scripts/pdfjoin
Lines 50-61 Link Here
50	for d in /etc /usr/share/etc /usr/local/share /usr/local/etc	50	for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
51	do if test -f $d/pdfnup.conf; then	51	do if test -f $d/pdfnup.conf; then
52	echo "Reading site configuration from $d/pdfnup.conf"	52	echo "Reading site configuration from $d/pdfnup.conf"
53	source $d/pdfnup.conf	53	. $d/pdfnup.conf
54	fi	54	fi
55	done	55	done
56	if test -f ~/.pdfnup.conf; then	56	if test -f ~/.pdfnup.conf; then
57	echo "Reading user defaults from ~/.pdfnup.conf";	57	echo "Reading user defaults from ~/.pdfnup.conf";
58	source ~/.pdfnup.conf;	58	. ~/.pdfnup.conf;
59	fi	59	fi
60	#######################################################################	60	#######################################################################
61	##	61	##
Lines 99-106 Link Here
99	##	99	##
100	## Check that necessary LaTeX packages are installed	100	## Check that necessary LaTeX packages are installed
101	##	101	##
102	PATH=`dirname "$pdflatex"`:$PATH	102	modifyPath="${pdflatex%/*}"
103	export PATH	103	[ -n "$modifyPath" ] && export PATH="$modifyPath:$PATH"
104	case `kpsewhich pdfpages.sty` in	104	case `kpsewhich pdfpages.sty` in
105	"") echo "pdfjoin: pdfpages.sty not installed"; exit 1;;	105	"") echo "pdfjoin: pdfpages.sty not installed"; exit 1;;
106	esac	106	esac
Lines 171-176 Link Here
171	##	171	##
172	## That's the arguments done.	172	## That's the arguments done.
173	##	173	##
		174
		175	mkTempDir=''
		176	trap 'test -n "$mkTempDir" && test -d "$mkTempDir" && \
		177	rm -rf -- "$mkTempDir" && mkTempDir=""; \
		178	trap - EXIT HUP INT TERM' EXIT HUP INT TERM
		179	if ! command -v mktemp >/dev/null 2>&1 \|\| \
		180	! mkTempDir=`mktemp -d -- "$tempfileDir/pdfjoin.XXXXXX"`
		181	then
		182	echo "pdfjoin: cannot create temporary directory"
		183	exit 2
		184	fi
		185	tempfileDir=$mkTempDir
		186
174	##	187	##
175	## Now work on the input files	188	## Now work on the input files
176	##	189	##
177	-- scripts/pdfnup	190	++ scripts/pdfnup
Lines 57-68 Link Here
57	for d in /etc /usr/share/etc /usr/local/share /usr/local/etc	57	for d in /etc /usr/share/etc /usr/local/share /usr/local/etc
58	do if test -f $d/pdfnup.conf; then	58	do if test -f $d/pdfnup.conf; then
59	echo "Reading site configuration from $d/pdfnup.conf"	59	echo "Reading site configuration from $d/pdfnup.conf"
60	source $d/pdfnup.conf	60	. $d/pdfnup.conf
61	fi	61	fi
62	done	62	done
63	if test -f ~/.pdfnup.conf; then	63	if test -f ~/.pdfnup.conf; then
64	echo "Reading user defaults from ~/.pdfnup.conf";	64	echo "Reading user defaults from ~/.pdfnup.conf";
65	source ~/.pdfnup.conf;	65	. ~/.pdfnup.conf;
66	fi	66	fi
67	#######################################################################	67	#######################################################################
68	##	68	##
Lines 134-141 Link Here
134	##	134	##
135	## Check that necessary LaTeX packages are installed	135	## Check that necessary LaTeX packages are installed
136	##	136	##
137	PATH=`dirname "$pdflatex"`:$PATH	137	modifyPath="${pdflatex%/*}"
138	export PATH	138	[ -n "$modifyPath" ] && export PATH="$modifyPath:$PATH"
139	case `kpsewhich pdfpages.sty` in	139	case `kpsewhich pdfpages.sty` in
140	"") echo "pdfnup: pdfpages.sty not installed"; exit 1;;	140	"") echo "pdfnup: pdfpages.sty not installed"; exit 1;;
141	esac	141	esac
Lines 232-237 Link Here
232	##	232	##
233	## That's the arguments done.	233	## That's the arguments done.
234	##	234	##
		235
		236	mkTempDir=''
		237	trap 'test -n "$mkTempDir" && test -d "$mkTempDir" && \
		238	rm -rf -- "$mkTempDir" && mkTempDir=""; \
		239	trap - EXIT HUP INT TERM' EXIT HUP INT TERM
		240	if ! command -v mktemp >/dev/null 2>&1 \|\| \
		241	! mkTempDir=`mktemp -d -- "$tempfileDir/pdfnup.XXXXXX"`
		242	then
		243	echo "pdfnup: cannot create temporary directory"
		244	exit 2
		245	fi
		246	tempfileDir=$mkTempDir
		247
		248	##
235	## Next sort out paper orientation, if not specified	249	## Next sort out paper orientation, if not specified
236	##	250	##
237	x=`echo $nup \| sed 's/..$//'`	251	x=`echo $nup \| sed 's/..$//'`