From 5d10adfd4e9bd228e0032600416483d028554fe4 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 3 Feb 2009 00:12:39 -0600 Subject: [PATCH 1/3] Tweaked INSTALL to note dbus and friends deps. --- INSTALL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 668b4a3..ee40e7c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation of Wicd should be done using your distribution package if one exists. If not, the installation is relatively straightforward, but there are a few dependencies: - 1. python (obviously) - 2. pygtk + 1. python (obviously) and pygtk + 2. dbus and its glib and python bindings 3. a dhcp client (dhclient, dhcpcd, and pump are supported) 4. wireless-tools (iwlist, iwconfig, etcetera) 5. net-tools (ip, route, etcetera) From 32b1a5372e384a2a1dcd6ce17134fde5469f4cb6 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 3 Feb 2009 00:26:28 -0600 Subject: [PATCH 2/3] More INSTALL tweaks. --- INSTALL | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/INSTALL b/INSTALL index ee40e7c..e563e4b 100644 --- a/INSTALL +++ b/INSTALL @@ -24,6 +24,10 @@ in Wicd will be placed. Pass "--help" as an option to the following command for more information, otherwise run it as is to configure Wicd for installation. python setup.py configure +Note that setup.py will try to determine if and where to install the autostart +desktop file for kde (either kde3 or kde4, but not both) and where to install +the sleep hook for pm-utils. + Finally, do the actual installation. This step will need to be done as root or with sudo in most cases: python setup.py install From 781e0eb743376b80d9068eca2d1e14cb8991ff95 Mon Sep 17 00:00:00 2001 From: Robby Workman Date: Tue, 3 Feb 2009 10:14:34 -0600 Subject: [PATCH 3/3] Bugfix to prevent creation of $HOME/~/ directory --- 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 a8e2a93..776581f 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 "$HOME/.wicd" ]; then + mkdir -p "$HOME/.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 "$HOME/.wicd/WHEREAREMYFILES" ]; then + ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES" fi if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then - if [ ! -f "~/.wicd/CLIENT_CURSES_WARNING" ]; then + if [ ! -f "$HOME/.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 >> "$HOME/.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.