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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 4e322148fa8cfac922098f691f2cfcf1ab5337d9
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date:   Fri Feb 20 08:53:59 2009 +0100

    Preparing for existing wicd config file.

diff --git a/install.sh b/install.sh
index 5017edd..80913be 100755
--- a/install.sh
+++ b/install.sh
@@ -797,13 +797,12 @@ case "$WITH_WIFI" in
  "wicd")
 	echo " * Installing wicd for wifi setup"
 	if [ -r "$INST_DIR/etc/wicd/manager-settings.conf" ]; then
-		echo "The file /etc/wicd/manager-settings.conf is already existing. This is not expected. Exiting."
-		echo "Please report to pkg-fso-maint at lists.alioth.debian.org."
-		exit 1
+		grep -v ^wired_interface "$INST_DIR/etc/wicd/manager-settings.conf" > \
+			"$INST_DIR/etc/wicd/manager-settings.conf"
 	else
 		mkdir $INST_DIR/etc/wicd
-		echo "wired_interface =" >> $INST_DIR/etc/wicd/manager-settings.conf
 	fi
+	echo "wired_interface =" >> $INST_DIR/etc/wicd/manager-settings.conf
 
 	if ! chroot $INST_DIR apt-get --yes install wicd; then
 		echo

-- 
Various non-packaged files