1
0
mirror of https://github.com/gryf/wicd.git synced 2026-01-05 21:34:16 +01:00

Merge experimental-rworkman

This commit is contained in:
Dan O'Reilly
2009-02-03 21:21:40 -05:00
2 changed files with 12 additions and 8 deletions

View File

@@ -1,8 +1,8 @@
Installation of Wicd should be done using your distribution package if one Installation of Wicd should be done using your distribution package if one
exists. If not, the installation is relatively straightforward, but there exists. If not, the installation is relatively straightforward, but there
are a few dependencies: are a few dependencies:
1. python (obviously) 1. python (obviously) and pygtk
2. pygtk 2. dbus and its glib and python bindings
3. a dhcp client (dhclient, dhcpcd, and pump are supported) 3. a dhcp client (dhclient, dhcpcd, and pump are supported)
4. wireless-tools (iwlist, iwconfig, etcetera) 4. wireless-tools (iwlist, iwconfig, etcetera)
5. net-tools (ip, route, etcetera) 5. net-tools (ip, route, etcetera)
@@ -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. for more information, otherwise run it as is to configure Wicd for installation.
python setup.py configure 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 Finally, do the actual installation. This step will need to be done as
root or with sudo in most cases: root or with sudo in most cases:
python setup.py install python setup.py install

View File

@@ -3,15 +3,15 @@ BOLD=$(tput bold)
BLUE=$(tput setaf 4) BLUE=$(tput setaf 4)
NC=$(tput sgr0) NC=$(tput sgr0)
# check_firstrun() # check_firstrun()
if [ ! -d "~/.wicd" ]; then if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "~/.wicd" mkdir -p "$HOME/.wicd"
fi fi
# Make sure the user knows WHEREAREMYFILES ;-) # Make sure the user knows WHEREAREMYFILES ;-)
if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "~/.wicd/WHEREAREMYFILES" ]; then if [ -e "%DOCDIR%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
ln -s "%DOCDIR%WHEREAREMYFILES" "~/.wicd/WHEREAREMYFILES" ln -s "%DOCDIR%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi fi
if [ "$DISPLAY" = "" ] && [ -x "%BIN%wicd-curses" ]; then 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 "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 "so ${BOLD}${BLUE}wicd-curses${NC} will be started instead. \n"
printf "Please see the wicd-client and/or wicd-curses manual pages \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" printf "Press enter to continue... \n"
read _junk 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 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 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. the event of the gui client being launched outside of the X Window environment.