X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/e7b956b59ea3cd892742f1679930208df76fadae..2d0b3b3c19724b35f4fc34ee30d54cc89c822f61:/abcde

diff --git a/abcde b/abcde
index 4ae4712..1d0c446 100755
--- a/abcde
+++ b/abcde
@@ -390,7 +390,7 @@ diffentries ()
 		if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBDIFFCHOICES ] || \
 		   [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBDIFFCHOICES ] || \
 		   [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then 
-			echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBDIFFCHOICES" >&2
+			echo "Invalid diff range. Please select two comma-separated numbers between 1 and $CDDBDIFFCHOICES" >&2
 		else
 			# We parse the 2 choices to diff, store them in temporary files and diff them.
 			for PARSECHOICE in $(echo $CDDBDIFFCHOICE | tr , \ ); do
@@ -1883,11 +1883,11 @@ do_discid ()
 			exit 1
 		fi
 		echo -n .
-		# It's a directory, let's see if it's owned by us
-		if [ ! -O "$ABCDETEMPDIR" ]; then
+		# It's a directory, let's see if it's writable by us
+		if [ ! -r "$ABCDETEMPDIR" ] || [ ! -w "$ABCDETEMPDIR" ] || [ ! -x "$ABCDETEMPDIR" ]; then
 			# Nope, complain and exit
 			echo >&2
-			echo "abcde: directory $ABCDETEMPDIR already exists and is not owned by you." >&2
+			echo "abcde: directory $ABCDETEMPDIR already exists and is not writeable." >&2
 			echo "Please investigate, remove it, and rerun abcde." >&2
 			exit 1
 		fi
@@ -2417,7 +2417,7 @@ do_cddbedit ()
 								if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBCHOICES ] || \
 								   [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBCHOICES ] || \
 								   [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then 
-									echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBCHOICES" >&2
+									echo "Invalid diff range. Please select two comma-separated numbers between 1 and $CDDBCHOICES" >&2
 								else
 									# We parse the 2 choices to diff, store them in temporary files and diff them.
 									for PARSECHOICE in $(echo $CDDBCHOICE | tr , \ ); do
@@ -3634,9 +3634,9 @@ else
 	TAGGEROPTS="$ID3V2OPTS"
 fi
 
-# Specific for NOGAP is the use of lame. Another encoder fails...
+# NOGAP is specific to lame. Other encoders fail ...
 if [ "$NOGAP" = "y" ] && [ ! "$MP3ENCODER" = "lame" ]; then
-	log warning "the NOGAP option is specific of lame. Deactivating..."
+	log warning "the NOGAP option is specific to lame. Deactivating..."
 	NOGAP=n
 fi