packages: icedove/icedove.sh - simplify;

[glen]

Author: glen                         Date: Thu Sep 23 08:12:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- simplify;

---- Files affected:
packages/icedove:
   icedove.sh (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.sh
diff -u packages/icedove/icedove.sh:1.6 packages/icedove/icedove.sh:1.7
--- packages/icedove/icedove.sh:1.6	Wed Aug 25 22:24:54 2010
+++ packages/icedove/icedove.sh	Thu Sep 23 10:12:03 2010
@@ -5,11 +5,9 @@
 
 # copy profile from Thunderbird if its available and if no Icedove
 # profile exists
-if [ ! -d $HOME/.icedove ]; then
-	if [ -d $HOME/.thunderbird ]; then
-		echo "Copying profile from Thunderbird"
-		cp -rf $HOME/.thunderbird $HOME/.icedove
-	fi
+if [ ! -d $HOME/.icedove ] && [ -d $HOME/.thunderbird ]; then
+	echo "Copying profile from Thunderbird"
+	cp -a $HOME/.thunderbird $HOME/.icedove
 fi
 
 # compreg.dat and/or chrome.rdf will screw things up if it's from an
@@ -26,7 +24,7 @@
 if [ "$1" == "-remote" ]; then
 	$ICEDOVE "$@"
 else
-	PING=`$ICEDOVE -remote 'ping()' 2>&1 >/dev/null`
+	PING=$($ICEDOVE -remote 'ping()' 2>&1 >/dev/null)
 	if [ -n "$PING" ]; then
 		$ICEDOVE "$@"
 	else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.sh?r1=1.6&r2=1.7&f=u