[pkg-fso-commits] [SCM] Various non-packaged files branch, master, updated. 9b1b6fc0c57b7bedbe96e6b9d28f605f25d81893

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 9b1b6fc0c57b7bedbe96e6b9d28f605f25d81893
Author: Steffen Moeller <moeller at debian.org>
Date:   Wed Dec 30 00:29:13 2009 +0100

    Allowing both for /etc/init.d/{qpe,qpt.sh}
    
    There are various distributions offering various ways to
    stop qpe via /etc/init.d/X. My local one instantiates X with
    qpe, others have qpe.sh. I have not tested the patch, so I
    must admit, though it addresses the issue raised in
    http://www.mail-archive.com/pkg-fso-maint@lists.alioth.debian.org/msg01690.html

diff --git a/install.sh b/install.sh
index fb07b58..e4cd028 100755
--- a/install.sh
+++ b/install.sh
@@ -675,7 +675,13 @@ action_testing () {
 
 	if ps -C qpe >/dev/null; then
 		echo "E: Qtopia wants to continually access /media/card.  You need to"
-		echo "   stop it with \`/etc/init.d/qpe stop\` or \`killall qpe\`    "
+		echo -n "   stop it with "
+		if [ -x "/etc/init.d/qpe" ]; then
+			echo -n "\`/etc/init.d/qpe stop\` or"
+		elif [ -x "/etc/init.d/qpe.sh" ]; then
+			echo -n "\`/etc/init.d/qpe.sh stop\` or"
+		fi
+		echo " \`killall qpe\`"
 		echo "   and then restart the installation!"
 		exit 1
 	fi

-- 
Various non-packaged files