From 3d2f5376466f5dbe214f74b3a55d0203df434627 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Sat, 24 Jan 2009 20:36:55 -0600 Subject: [PATCH 1/9] s/subversion/bzr/ in INSTALL file. Possibly more changes coming... --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index e5ea37d..eb5fa67 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation of Wicd should be done using your distribution package if one exists. If not, the installation is relatively straightforward. -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. From d1656b46eb85999690243eb175ece3f1426cf4b9 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Mon, 26 Jan 2009 10:37:06 -0600 Subject: [PATCH 2/9] Updated INSTALL with some dependency information. --- INSTALL | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index eb5fa67..abf0a16 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,14 @@ 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) If you are installing from a bzr pull or beta/rc tarball and you want the native language translations, first run this: From 7765abf9b524d90e4a09610247268b83c135a8c1 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 28 Jan 2009 19:28:05 -0600 Subject: [PATCH 3/9] Merged changes from svenstaro to the Arch init script, and then did some cleanup edits in this tree. --- in/init=arch=wicd.in | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/in/init=arch=wicd.in b/in/init=arch=wicd.in index 5e5b114..fbfdb75 100755 --- a/in/init=arch=wicd.in +++ b/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 From 728fa198ce2a4da901a6d639832224f9b1afb8c2 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 28 Jan 2009 20:54:31 -0600 Subject: [PATCH 4/9] Updated Gentoo's init script from portage. Thanks to Jeremy Olexa (darkside_). --- in/init=gentoo=wicd.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/in/init=gentoo=wicd.in b/in/init=gentoo=wicd.in index c048622..6f307bc 100755 --- a/in/init=gentoo=wicd.in +++ b/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 $? } + From 87ede3379eeea849acbd1a0106777a842ac1d881 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Wed, 28 Jan 2009 21:40:40 -0600 Subject: [PATCH 5/9] Quote some values in the wicd-client.in script, in case some insane person passes a VERSION string with spaces in it. I can't imagine who would have done such a thing ;-) --- in/scripts=wicd-client.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/in/scripts=wicd-client.in b/in/scripts=wicd-client.in index 49288fc..a8e2a93 100755 --- a/in/scripts=wicd-client.in +++ b/in/scripts=wicd-client.in @@ -3,15 +3,15 @@ BOLD=$(tput bold) BLUE=$(tput setaf 4) NC=$(tput sgr0) # check_firstrun() -if [ ! -d ~/.wicd ]; then - mkdir -p ~/.wicd +if [ ! -d "~/.wicd" ]; then + mkdir -p "~/.wicd" fi # Make sure the user knows WHEREAREMYFILES ;-) -if [ -e %DOCDIR%WHEREAREMYFILES ] && [ ! -L ~/.wicd/WHEREAREMYFILES ]; then - ln -s %DOCDIR%WHEREAREMYFILES ~/.wicd/WHEREAREMYFILES +if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "~/.wicd/WHEREAREMYFILES" ]; then + ln -s "%DOCDIR%WHEREAREMYFILES" "~/.wicd/WHEREAREMYFILES" fi if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then - if [ ! -f ~/.wicd/CLIENT_CURSES_WARNING ]; then + if [ ! -f "~/.wicd/CLIENT_CURSES_WARNING" ]; then printf "NOTICE: You do not have an X server active on this console, \n" printf "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n" printf "Please see the wicd-client and/or wicd-curses manual pages \n" @@ -21,7 +21,7 @@ if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then printf "Press enter to continue... \n" read _junk - cat >> ~/.wicd/CLIENT_CURSES_WARNING << EOF + cat >> "~/.wicd/CLIENT_CURSES_WARNING" << EOF The wicd-client script checks for the existence of this file to determine whether it should warn the user before launching wicd-curses instead, in the event of the gui client being launched outside of the X Window environment. From d5ce9696f2921b1e63873e6286c4906f1f464900 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Thu, 29 Jan 2009 11:06:27 -0600 Subject: [PATCH 6/9] Removed an unneeded wicd.png from other/ and fixed up the wicd.desktop file in there (for users who want to just start the client without the tray icon, and have a menu entry to do so). --- other/wicd.desktop | 12 +++++++----- other/wicd.png | Bin 4000 -> 0 bytes 2 files changed, 7 insertions(+), 5 deletions(-) mode change 100755 => 100644 other/wicd.desktop delete mode 100755 other/wicd.png diff --git a/other/wicd.desktop b/other/wicd.desktop old mode 100755 new mode 100644 index 491f275..063c602 --- a/other/wicd.desktop +++ b/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 Tray +Name[en_US]=Wicd Network Manager Tray +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 diff --git a/other/wicd.png b/other/wicd.png deleted file mode 100755 index 460b80f01f463a2ec6f222bc3896b47289867a26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4000 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 Date: Thu, 29 Jan 2009 11:12:32 -0600 Subject: [PATCH 7/9] Removed references to "Tray" from other/wicd.desktop --- other/wicd.desktop | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/other/wicd.desktop b/other/wicd.desktop index 063c602..7221c15 100644 --- a/other/wicd.desktop +++ b/other/wicd.desktop @@ -5,8 +5,8 @@ Exec=wicd-client --no-tray GenericName=Network Manager Icon=wicd-client Icon[en_US]=wicd-client -Name=Wicd Network Manager Tray -Name[en_US]=Wicd Network Manager Tray +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 From 4521b85c9ae9b930d360075a02a916e5209230e7 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Thu, 29 Jan 2009 11:33:40 -0600 Subject: [PATCH 8/9] This merges from the selinux branch (I accidentally edited the wrong branch) with a note in INSTALL about pm-utils optional dep. --- INSTALL | 1 + 1 file changed, 1 insertion(+) diff --git a/INSTALL b/INSTALL index abf0a16..668b4a3 100644 --- a/INSTALL +++ b/INSTALL @@ -9,6 +9,7 @@ are a few dependencies: 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 bzr pull or beta/rc tarball and you want the native language translations, first run this: From 7f1959a71bee2d7d5c07b32298f32ffc5d2f7f6d Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Fri, 30 Jan 2009 21:48:59 -0600 Subject: [PATCH 9/9] Fix a harmless typo. --- curses/configscript_curses.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curses/configscript_curses.py b/curses/configscript_curses.py index e0c4b8e..46f1e60 100755 --- a/curses/configscript_curses.py +++ b/curses/configscript_curses.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """configscript_curses.py -Kind of like configscript.py, except writtwn using urwid. +Kind of like configscript.py, except written using urwid. Also recycles a lot of configscript.py, too. :-) """