--- foo2zjs.orig/getweb.in	2013-12-26 01:00:11.000000000 +0400

+++ foo2zjs/getweb.in	2014-01-04 20:31:41.000000000 +0400

@@ -17,82 +17,80 @@

 cat <<EOF

 Usage:

-    ./getweb something

+    ./getweb <path> something

     Convenience script to get extra somethings from the web,

     such as ICC color profiles, firmware, PPD files, etc.

-    $ ./getweb 1025     # Get HP LaserJet Pro CP1025nw .ICM files

-    $ ./getweb 1215	# Get HP Color LaserJet CP1215 .ICM files

-    $ ./getweb 1500	# Get HP Color LaserJet 1500 .ICM files

-    $ ./getweb 1600	# Get HP Color LaserJet 1600 .ICM files

-    $ ./getweb 2600n	# Get HP Color LaserJet 2600n .ICM files

+    $ ./getweb 1025 <path>	# Get HP LaserJet Pro CP1025nw .ICM files

+    $ ./getweb 1215 <path>	# Get HP Color LaserJet CP1215 .ICM files

+    $ ./getweb 1500 <path>	# Get HP Color LaserJet 1500 .ICM files

+    $ ./getweb 1600 <path>	# Get HP Color LaserJet 1600 .ICM files

+    $ ./getweb 2600n <path>	# Get HP Color LaserJet 2600n .ICM files

-    $ ./getweb 1600w	# Get Konica Minolta 1600W .ICM files

-    $ ./getweb 1680	# Get Konica Minolta 1680MF .ICM files

-    $ ./getweb 1690	# Get Konica Minolta 1690MF .ICM files

-    $ ./getweb 2480	# Get Konica Minolta 2480 MF .ICM files

-    $ ./getweb 2490	# Get Konica Minolta 2490 MF .ICM files

-    $ ./getweb 2530	# Get Konica Minolta 2530 DL .ICM files

-    $ ./getweb 4690	# Get Konica Minolta 4690MF .ICM files

-    $ ./getweb 6115	# Get Xerox Phaser 6115MFP .ICM files

-    $ ./getweb 110	# Get Oki C110 .ICM files

-    $ ./getweb 6121	# Get Xerox Phaser 6121MFP .ICM files

+    $ ./getweb 1600w <path>	# Get Konica Minolta 1600W .ICM files

+    $ ./getweb 1680 <path>	# Get Konica Minolta 1680MF .ICM files

+    $ ./getweb 1690 <path>	# Get Konica Minolta 1690MF .ICM files

+    $ ./getweb 2480 <path>	# Get Konica Minolta 2480 MF .ICM files

+    $ ./getweb 2490 <path>	# Get Konica Minolta 2490 MF .ICM files

+    $ ./getweb 2530 <path>	# Get Konica Minolta 2530 DL .ICM files

+    $ ./getweb 4690 <path>	# Get Konica Minolta 4690MF .ICM files

+    $ ./getweb 6115 <path>	# Get Xerox Phaser 6115MFP .ICM files

+    $ ./getweb 110 <path>	# Get Oki C110 .ICM files

+    $ ./getweb 6121 <path>	# Get Xerox Phaser 6121MFP .ICM files

-    $ ./getweb 2200	# Get Minolta 2200 DL .ICM files

-    $ ./getweb 2300	# Get Minolta 2300 DL .ICM files

-    $ ./getweb 2430	# Get Konica Minolta 2430 DL .ICM files

-    $ ./getweb cpwl	# Get Minolta Color PageWorks/Pro L .ICM files

+    $ ./getweb 2200 <path>	# Get Minolta 2200 DL .ICM files

+    $ ./getweb 2300 <path>	# Get Minolta 2300 DL .ICM files

+    $ ./getweb 2430 <path>	# Get Konica Minolta 2430 DL .ICM files

+    $ ./getweb cpwl <path>	# Get Minolta Color PageWorks/Pro L .ICM files

-    $ ./getweb 300	# Get Samsung CLP-300 .ICM files

-    $ ./getweb 310	# Get Samsung CLP-310 .ICM files

-    $ ./getweb 315	# Get Samsung CLP-315 .ICM files

-    $ ./getweb 325	# Get Samsung CLP-325 .ICM files

-    $ ./getweb 360	# Get Samsung CLP-360 .ICM files

-    $ ./getweb 365	# Get Samsung CLP-365 .ICM files

-    $ ./getweb 600	# Get Samsung CLP-600 .ICM files

-    $ ./getweb 610	# Get Samsung CLP-610 .ICM files

-    $ ./getweb 2160	# Get Samsung CLX-2160 .ICM files

-    $ ./getweb 3160	# Get Samsung CLX-3160 .ICM files

-    $ ./getweb 3175	# Get Samsung CLX-3175 .ICM files

-    $ ./getweb 3185	# Get Samsung CLX-3185 .ICM files

-    $ ./getweb 6110	# Get Xerox Phaser 6110 and 6110MFP .ICM files

+    $ ./getweb 300 <path>	# Get Samsung CLP-300 .ICM files

+    $ ./getweb 310 <path>	# Get Samsung CLP-310 .ICM files

+    $ ./getweb 315 <path>	# Get Samsung CLP-315 .ICM files

+    $ ./getweb 325 <path>	# Get Samsung CLP-325 .ICM files

+    $ ./getweb 360 <path>	# Get Samsung CLP-360 .ICM files

+    $ ./getweb 365 <path>	# Get Samsung CLP-365 .ICM files

+    $ ./getweb 600 <path>	# Get Samsung CLP-600 .ICM files

+    $ ./getweb 610 <path>	# Get Samsung CLP-610 .ICM files

+    $ ./getweb 2160 <path>	# Get Samsung CLX-2160 .ICM files

+    $ ./getweb 3160 <path>	# Get Samsung CLX-3160 .ICM files

+    $ ./getweb 3175 <path>	# Get Samsung CLX-3175 .ICM files

+    $ ./getweb 3185 <path>	# Get Samsung CLX-3185 .ICM files

+    $ ./getweb 6110 <path>	# Get Xerox Phaser 6110 and 6110MFP .ICM files

-    $ ./getweb 500	# Get Lexmark C500 .ICM files

+    $ ./getweb 500 <path>	# Get Lexmark C500 .ICM files

-    $ ./getweb 301	# Get Oki C301dn .ICM files

-    $ ./getweb c310	# Get Oki C310dn .ICM files

-    $ ./getweb c511	# Get Oki C511dn .ICM files

-    $ ./getweb c810	# Get Oki C810 .ICM files

-    $ ./getweb 3100	# Get Oki C3100 .ICM files

-    $ ./getweb 3200	# Get Oki C3200 .ICM files

-    $ ./getweb 3300	# Get Oki C3300 .ICM files

-    $ ./getweb 3400	# Get Oki C3400 .ICM files

-    $ ./getweb 3530	# Get Oki C3530 MFP .ICM files

-    $ ./getweb 5100	# Get Oki C5100 / C5150n .ICM files

-    $ ./getweb 5200	# Get Oki C5200 .ICM files

-    $ ./getweb 5500	# Get Oki C5500 .ICM files

-    $ ./getweb 5600	# Get Oki C5600 .ICM files

-    $ ./getweb 5800	# Get Oki C5800 .ICM files

+    $ ./getweb 301 <path>	# Get Oki C301dn .ICM files

+    $ ./getweb c310 <path>	# Get Oki C310dn .ICM files

+    $ ./getweb c511 <path>	# Get Oki C511dn .ICM files

+    $ ./getweb c810 <path>	# Get Oki C810 .ICM files

+    $ ./getweb 3100 <path>	# Get Oki C3100 .ICM files

+    $ ./getweb 3200 <path>	# Get Oki C3200 .ICM files

+    $ ./getweb 3300 <path>	# Get Oki C3300 .ICM files

+    $ ./getweb 3400 <path>	# Get Oki C3400 .ICM files

+    $ ./getweb 3530 <path>	# Get Oki C3530 MFP .ICM files

+    $ ./getweb 5100 <path>	# Get Oki C5100 / C5150n .ICM files

+    $ ./getweb 5200 <path>	# Get Oki C5200 .ICM files

+    $ ./getweb 5500 <path>	# Get Oki C5500 .ICM files

+    $ ./getweb 5600 <path>	# Get Oki C5600 .ICM files

+    $ ./getweb 5800 <path>	# Get Oki C5800 .ICM files

-    $ ./getweb 160	# Get Olivetti d-Color P160W .ICM files

+    $ ./getweb 160 <path>	# Get Olivetti d-Color P160W .ICM files

-    $ ./getweb 1000	# Get HP LJ 1000 firmware file

-    $ ./getweb 1005	# Get HP LJ 1005 firmware file

-    $ ./getweb 1018	# Get HP LJ 1005 firmware file

-    $ ./getweb 1020	# Get HP LJ 1020 firmware file

+    $ ./getweb 1000 <path>	# Get HP LJ 1000 firmware file

+    $ ./getweb 1005 <path>	# Get HP LJ 1005 firmware file

+    $ ./getweb 1018 <path>	# Get HP LJ 1005 firmware file

+    $ ./getweb 1020 <path>	# Get HP LJ 1020 firmware file

-    $ ./getweb p1005	# Get HP LJ P1005 firmware file

-    $ ./getweb p1006	# Get HP LJ P1006 firmware file

-    $ ./getweb p1007	# Get HP LJ P1007 firmware file

-    $ ./getweb p1008	# Get HP LJ P1008 firmware file

-    $ ./getweb p1505	# Get HP LJ P1505 firmware file

+    $ ./getweb p1005 <path>	# Get HP LJ P1005 firmware file

+    $ ./getweb p1006 <path>	# Get HP LJ P1006 firmware file

+    $ ./getweb p1007 <path>	# Get HP LJ P1007 firmware file

+    $ ./getweb p1008 <path>	# Get HP LJ P1008 firmware file

+    $ ./getweb p1505 <path>	# Get HP LJ P1505 firmware file

-    $ ./getweb all	# Get everything above

+    $ ./getweb all <path>	# Get everything above

-    $ ./getweb 2300dl_fw # Get Minolta 2300DL v2.55 firmware (experts only)

-

-    $ ./getweb update	# Get latest version of this software.

+    $ ./getweb <path> 2300dl_fw # Get Minolta 2300DL v2.55 firmware (experts only)

 EOF

     exit 1

 }

@@ -111,7 +109,8 @@

     WGETOPTS=

     wget() {

 	shift

-	curl -o $*

+	local curl="curl"

+	$curl -o $*

     }

 fi

@@ -120,11 +119,13 @@

 #	files we want

 getexe() {

     url="$1"

-    exefile="$2"

+    mypath="$2"

+    exefile="$3"

     shift; shift

-    wget $WGETOPTS -O $exefile "$url/$exefile" ||

+    wget $WGETOPTS -O $mypath/$exefile "$url/$exefile" ||

 	error "Couldn't download $url/$exefile"

+    cd $mypath

     unzip -oj $exefile "$@"

     rm $exefile

 }

@@ -136,9 +137,10 @@

     url="$1"

     file="$2"

     what="$3"

-    

-    wget $WGETOPTS -O $file "$url/$file" ||

+    mypath="$4"

+    wget $WGETOPTS -O $mypath/$file "$url/$file" ||

 	error "Couldn't download $url/$file"

+    cd $mypath

     gunzip <$file | tar xvf - $what

     rm $file

 }

@@ -154,7 +156,8 @@

     lj1000|1000)

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihp1000.tar.gz \

-	    ""

+	    "" \

+	    $2

 	#echo "provided"

 	#getexe \

 	    #ftp://ftp.hp.com/pub/softlib/software1/lj1488/lj-1145-2 \

@@ -165,7 +168,8 @@

     lj1005|1005)

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihp1005.tar.gz \

-	    ""

+	    "" \

+	    $2

 	#echo "provided"

 	#getexe \

 	    #ftp://ftp.hp.com/pub/softlib/software2/COL2222/lj-10067-2 \

@@ -174,48 +178,55 @@

 	copyright "(c) Copyright Hewlett-Packard 2002"

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2009"

 	;;

     lj1018|1018)

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihp1018.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2005"

 	;;

     lj1020|1020)

 	# http://ftp.hp.com/pub/softlib/software8/COL14041/lj-39322-2/hp_LJ_1020-1022_Full_Solution.exe

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihp1020.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2005"

 	;;

     [pP]100[57])

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihpP1005.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2009"

 	;;

     [pP]100[68])

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihpP1006.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2009"

 	;;

     [pP]1505)

 	gettgz \

 	    http://foo2zjs.rkkda.com/firmware sihpP1505.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2009"

 	;;

     2200dl|2200)

 	if true; then

 	    gettgz \

 		http://foo2zjs.rkkda.com/icm dl2300.tar.gz \

-		""

+		"" \

+		$2

 	else

 	    getexe \

-		http://printer.konicaminolta.net/drivers/win2000 m22dlicc.exe \

+		http://printer.konicaminolta.net/drivers/win2000 $2 m22dlicc.exe \

 		"*.icm"

 	fi

 	copyright "(c) Copyright Minolta-QMS 1999"

@@ -224,15 +235,17 @@

 	if true; then

 	    gettgz \

 		http://foo2zjs.rkkda.com/icm dl2300.tar.gz \

-		""

+		""\

+		$2

 	else

 	    getexe \

-		http://printer.konicaminolta.net/drivers/other m23dlicc.exe \

+		http://printer.konicaminolta.net/drivers/other $2 m23dlicc.exe \

 		"*.icm"

 	fi

 	gettgz \

 	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Minolta-QMS 2001"

 	;;

     2300dl_fw)

@@ -241,18 +254,20 @@

 	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"

 	FILE="MC2300DL_v255.zip"

 	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"

-	wget $WGETOPTS "$URL" || error "Couldn't download $URL"

+	wget $WGETOPTS -O $mypath/$FILE "$URL" || error "Couldn't download $URL"

 	echo "*** Now use a windows box to unzip and install $FILE ***"

 	;;

     cpwl|pageworks)

 	if true; then

 	    gettgz \

 		http://foo2zjs.rkkda.com/icm dl2300.tar.gz \

-		""

+		"" \

+		$2

 	else

 	    getexe \

-		ftp://ftp.minolta-qms.com/pub/crc/out_going/windows cpplxp.exe \

+		ftp://ftp.minolta-qms.com/pub/crc/out_going/windows $2 cpplxp.exe \

 		"*.IC_"

+	    cd $2

 	    for i in C*.IC_

 	    do

 		base=`basename $i .IC_`

@@ -266,59 +281,70 @@

     2430)

 	gettgz \

 	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Konica Minolta 2003"

 	;;

     2530|2490|6115|2480|1600w|1680|1690|4690|110|6121)

 	gettgz \

 	    http://foo2lava.rkkda.com/icm km2530.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Konica Minolta 2005"

 	copyright "(c) Copyright Rick Richardson 2007.  All Rights Reserved"

 	gettgz \

 	    http://foo2lava.rkkda.com/icm km-1600.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Rick Richardson 2009.  All Rights Reserved"

 	;;

     1500)

 	gettgz \

 	    http://foo2hp.rkkda.com/icm hpclj2500.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2002"

 	gettgz \

 	    http://foo2hp.rkkda.com/icm hpclj2600n.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2003"

 	copyright "(c) Copyright Rick Richardson 2006.  All Rights Reserved"

 	;;

     1025)

 	gettgz \

 	    http://foo2zjs.rkkda.com/icm hp-cp1025.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Rick Richardson 2010.  All Rights Reserved"

 	;;

     1215|1600|2600*)

 	gettgz \

 	    http://foo2hp.rkkda.com/icm hpclj2600n.tar.gz \

-	    ""

+	    "" \

+	    $2

 	gettgz \

 	    http://foo2zjs.rkkda.com/icm km2430.tar.gz \

-	    "km2430_2.icm"

+	    "km2430_2.icm" \

+	    $2

 	copyright "(c) Copyright Hewlett-Packard 2003"

 	copyright "(c) Copyright Rick Richardson 2006.  All Rights Reserved"

 	gettgz \

 	    http://foo2hp.rkkda.com/icm hp1215.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Rick Richardson 2008.  All Rights Reserved"

 	;;

     300|310|315|325|360|365|2160|3160|3175|3185|6110)

 	gettgz \

 	    http://foo2qpdl.rkkda.com/icm samclp300.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Rick Richardson 2007.  All Rights Reserved"

 	gettgz \

 	    http://foo2qpdl.rkkda.com/icm samclp315.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Rick Richardson 2008.  All Rights Reserved"

 	;;

     600|610)

@@ -327,16 +353,18 @@

     500)

 	gettgz \

 	    http://foo2slx.rkkda.com/icm lexc500.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Lexmark 2006"

 	;;

     oki)

 	echo "Please wait, ~20MB is being downloaded from a slow site..."

 	getexe \

-	    http://www.okiprintingsolutions.at/binaryData/16516/ \

+	    http://www.okiprintingsolutions.at/binaryData/16516/ $2 \

 	    ICCProfiles.zip \

 	    "*OK3200*ICM" "*OK5600*ICM" "*rom732*7.zip"

+	cd $2

 	unzip -oj *rom732*7.zip "*C3400*ICM"

 	rm -f *rom732*7.zip

 	for i in OK*ICM C3400*ICM; do

@@ -348,43 +376,50 @@

     301)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic301.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2012"

 	;;

     c310)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic310.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2010"

 	;;

     c511)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic511.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2012"

 	;;

     c810)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic810.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2012"

 	;;

     3100|3200|5100|5150|5200|5250)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic3200.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2005"

 	;;

     3300|3400|3530)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic3400.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2006"

 	;;

     5500|5600|5800|160)

 	gettgz \

 	    http://foo2hiperc.rkkda.com/icm okic5600.tar.gz \

-	    ""

+	    "" \

+	    $2

 	copyright "(c) Copyright Okidata 2006"

 	;;

@@ -435,23 +469,6 @@

 		# | sed -e 's/\(^\*NickName.*\)"/\1 (foo2zjs recommended)"/'

 	done

 	;;

-    update)

-	url=${URLZJS}

-	file=foo2zjs.tar.gz

-	wget $WGETOPTS -O $file $url/$file ||

-		error "Couldn't download $url/$exefile"

-	mv getweb getweb.old

-	HERE=`pwd`

-	cd .. 

-	tar zxf $HERE/$file

-	cd $HERE

-	echo "The tarball is extracted and the current directory is up to date."

-	echo -e "Remove the tarball (y/n)? \c"

-	read ans

-	if [ "$ans" = y ]; then

-	    rm -f $file

-	fi

-	;;

     "")

 	usage

 	;;

@@ -468,45 +485,46 @@

 for i in $*

 do

+MYPATH="$2"

     case "$1" in

     all)

-	getone 1000

-	getone 1005

-	getone 1018

-	getone 1020

-

-	getone p1005

-	getone p1006

-	getone p1505

+	getone 1000 "$MYPATH"

+	getone 1005 "$MYPATH"

+	getone 1018 "$MYPATH"

+	getone 1020 "$MYPATH"

+

+	getone p1005 "$MYPATH"

+	getone p1006 "$MYPATH"

+	getone p1505 "$MYPATH"

-	getone 2200

-	getone 2300

+	getone 2200 "$MYPATH"

+	getone 2300 "$MYPATH"

 	# getone 2430 already done

 	# getone cpwl # file doesn't exist 1/28/08

-	getone 1500

-	getone 2600n

+	getone 1500 "$MYPATH"

+	getone 2600n "$MYPATH"

 	# getone 1215 # already done

-	getone 1025

+	getone 1025 "$MYPATH"

-	getone 2530

+	getone 2530 "$MYPATH"

-	getone 300

+	getone 300 "$MYPATH"

 	# getone 6110 already done

-	getone 600

+	getone 600 "$MYPATH"

-	getone 500

+	getone 500 "$MYPATH"

-	getone 301

-	getone c310

-	getone c511

-	getone c810

-	getone 3200

-	getone 3400

-	getone 5600

+	getone 301 "$MYPATH"

+	getone c310 "$MYPATH"

+	getone c511 "$MYPATH"

+	getone c810 "$MYPATH"

+	getone 3200 "$MYPATH"

+	getone 3400 "$MYPATH"

+	getone 5600 "$MYPATH"

 	;;

     *)	

-	getone $i

+	getone $i "$MYPATH"

 	;;

     esac

 done