Merged rworkman's experimental branch

INSTALL

@@ -1,7 +1,17 @@
 Installation of Wicd should be done using your distribution package if one
-exists.  If not, the installation is relatively straightforward.
+exists.  If not, the installation is relatively straightforward, but there
+are a few dependencies:
+  1. python (obviously)
+  2. pygtk
+  3. a dhcp client (dhclient, dhcpcd, and pump are supported)
+  4. wireless-tools (iwlist, iwconfig, etcetera)
+  5. net-tools (ip, route, etcetera)
+  6. a graphical sudo application (gksu, kdesu, and ktsuss are supported),
+     while optional, is strongly recommended
+  7. urwid (if you want to use the curses client)
+  8. pm-utils (optional for suspend/resume integration - needs version 1.2.4+)
 
-If you are installing from a subversion pull or beta/rc tarball and you want 
+If you are installing from a bzr pull or beta/rc tarball and you want 
 the native language translations, first run this:
   python setup.py get_translations
 You will not need to do this if you're installing from a release tarball.

in/init=arch=wicd.in

@@ -1,26 +1,39 @@
 #!/bin/bash
 
-# borrowed from
-# http://repos.archlinux.org/viewvc.cgi/wicd/repos/extra-i686/wicd-daemon?revision=1&view=markup
-# and modified for 1.5.0
+# Arch init script for wicd
 
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+WICD_BIN=%SBIN%wicd
+
+if [ -f /var/run/wicd/wicd.pid ]; then 
+	PID="$(cat /var/run/wicd/wicd.pid)"
+fi
+
 case "$1" in
   start)
     stat_busy "Starting wicd Daemon"
-    killall wicd &> /dev/null
-    %SBIN%wicd-daemon &> /dev/null
-    add_daemon wicd
-    stat_done
-    ;;
+	if [ -z "$PID" ]; then
+    	$WICD_BIN &> /dev/null
+	fi 
+	if [ ! -z "$PID" -o $? -gt 0 ]; then
+		stat_fail
+	else
+		add_daemon wicd
+		stat_done
+	fi
+	;;
   stop)
     stat_busy "Stopping wicd Daemon"
-    killall wicd &> /dev/null
-    rm_daemon wicd
-    stat_done
-    ;;
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
+	if [ $? -gt 0 ]; then
+		stat_fail
+	else
+		rm_daemon wicd
+		stat_done
+	fi
+	;;
   restart)
     $0 stop
     sleep 1
@@ -29,5 +42,6 @@ case "$1" in
   *)
     echo "usage: $0 {start|stop|restart}"  
 esac
+
 exit 0
 

in/init=gentoo=wicd.in

@@ -13,12 +13,13 @@ depend() {
 
 start() {
 	ebegin "Starting wicd daemon"
-	$WICD_DAEMON &>/dev/null
+	"${WICD_DAEMON}" >/dev/null 2>&1
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping wicd daemon"
-	start-stop-daemon --stop --pidfile "$WICD_PIDFILE"
+	start-stop-daemon --stop --pidfile "${WICD_PIDFILE}"
 	eend $?
 }
+

other/wicd.desktop

@@ -1,12 +1,14 @@
 [Desktop Entry]
 Categories=Application;Network;
 Encoding=UTF-8
-Exec=/opt/wicd/gui.py
+Exec=wicd-client --no-tray
 GenericName=Network Manager
-Icon=/opt/wicd/images/wicd.png
-Icon[en_US]=/opt/wicd/images/wicd.png
-Name=Wicd
-Name[en_US]=Wicd
+Icon=wicd-client
+Icon[en_US]=wicd-client
+Name=Wicd Network Manager
+Name[en_US]=Wicd Network Manager
+Comment=Start the Wicd client without system tray icon
+Comment[en_US]=Start the Wicd client without system tray icon
 Terminal=false
 Type=Application
 Version=1.0