X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/e823b91110b37db144c71abf0f559a40269a8487..dde7052dd4500a1c4e0570db71365211ccfd7dfd:/cddb-tool

diff --git a/cddb-tool b/cddb-tool
index 5e365b5..1833986 100755
--- a/cddb-tool
+++ b/cddb-tool
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (C) 1999 Nathaniel Smith <njs@uclink4.berkeley.edu>
 # Copyright (C) 1999, 2000, 2001 Robert Woodcock <rcw@debian.org>
@@ -6,9 +6,9 @@
 # This code is hereby licensed for public consumption under either the
 # GNU GPL v2 or greater, or Larry Wall's Artistic License - your choice.
 #
-# You should have recieved a copy of the GNU General Public License
+# You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Copyright for this work is to expire January 1, 2010, after which it
 # shall be public domain.
@@ -44,7 +44,7 @@ if [ "$HTTPGET" = "" ]; then
 		HTTPGETOPTS=${HTTPGETOPTS:="-f -s"}
 	else
 		HTTPGET=wget
-		HTTPGETOPTS=${HTTPGETOPTS:="-q -nv -O -"}
+		HTTPGETOPTS=${HTTPGETOPTS:="-q -nv -e timestamping=off -O -"}
 	fi
 fi
 
@@ -208,7 +208,7 @@ query) # cddb-tool query serverurl proto user host discid...
 	shift 4
 	TRACKINFO="$@"
 	TRACKINFOPLUS=$(echo $TRACKINFO | tr ' ' '+')
-	RESULTS=$($HTTPGET "$SERVER?cmd=cddb+query+$TRACKINFOPLUS\&hello=$HELLOINFO\&proto=$PROTO") || exit $LOOKUP_ERR
+	RESULTS=$($HTTPGET "$SERVER?cmd=cddb+query+$TRACKINFOPLUS&hello=$HELLOINFO&proto=$PROTO") || exit $LOOKUP_ERR
 	echo "$RESULTS" | tr '\r' '\n' | tr -s '\n' | sed 's/^ //g'
 	;;
 
@@ -220,7 +220,7 @@ read) # cddb-tool read serverurl proto user host genre discnumber
 	CATEGORY="$5"
 	DISCID="$6"
 	HELLOINFO="$USER+$HOST+$NAME+$VERSION"
-	$HTTPGET $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID\&hello=$HELLOINFO\&proto=$PROTO" 2>/dev/null
+	$HTTPGET $CDDBDATA "$SERVER?cmd=cddb+read+$CATEGORY+$DISCID&hello=$HELLOINFO&proto=$PROTO" 2>/dev/null
 	;;
 
 stat) # cddb-tool stat serverurl user host proto
@@ -229,7 +229,7 @@ stat) # cddb-tool stat serverurl user host proto
 	HOST="$3"
 	PROTO="$4"
 	HELLOINFO="$USER+$HOST+$NAME+$VERSION"
-	$HTTPGET $CDDBDATA "$SERVER?cmd=stat&hello=$HELLOINFO\&proto=$PROTO" 2>/dev/null
+	$HTTPGET $CDDBDATA "$SERVER?cmd=stat&hello=$HELLOINFO&proto=$PROTO" 2>/dev/null
 	;;
 
 help) # help