diff --git a/curses/README b/curses/README index 8ee7f80..f3832a6 100644 --- a/curses/README +++ b/curses/README @@ -7,7 +7,8 @@ work on it more and figure out how to use distutils. Right now, it lists current available networks, and whether you are connected to anything or not, all of which is updated in real time. It will actually -connect you to networks now. Configuring them is a work in progress. +connect you to networks now. Global preferences are now configurable from the +console. Per-network settings is a work in progress. Controls: diff --git a/in/man=wicd-manager-settings.conf.5.in b/in/man=wicd-manager-settings.conf.5.in index a27b724..847e2f1 100644 --- a/in/man=wicd-manager-settings.conf.5.in +++ b/in/man=wicd-manager-settings.conf.5.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD-MANAGER-SETTINGS.CONF 5 "June 2008" "wicd-1.5.0" +.TH WICD-MANAGER-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%" .SH NAME wicd-manager-settings.conf \- contains settings that control Wicd's behavior diff --git a/in/man=wicd-wired-settings.conf.5.in b/in/man=wicd-wired-settings.conf.5.in index 74f30f3..55a66cf 100644 --- a/in/man=wicd-wired-settings.conf.5.in +++ b/in/man=wicd-wired-settings.conf.5.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD-WIRED-SETTINGS.CONF 5 "June 2008" "wicd-1.5.0" +.TH WICD-WIRED-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%" .SH NAME wicd-wired-settings.conf \- controls Wicd's wired network settings diff --git a/in/man=wicd-wireless-settings.conf.5.in b/in/man=wicd-wireless-settings.conf.5.in index 5b08362..cf1afd3 100644 --- a/in/man=wicd-wireless-settings.conf.5.in +++ b/in/man=wicd-wireless-settings.conf.5.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD-WIRELESS-SETTINGS.CONF 5 "June 2008" "wicd-1.5.0" +.TH WICD-WIRELESS-SETTINGS.CONF 5 "June 2008" "wicd-%VERSION%" .SH NAME wicd-wired-settings.conf \- controls Wicd's wireless network settings diff --git a/in/man=wicd.8.in b/in/man=wicd.8.in index 4906024..9ca7591 100644 --- a/in/man=wicd.8.in +++ b/in/man=wicd.8.in @@ -1,5 +1,5 @@ .\" Written by Robby Workman -.TH WICD 8 "June 2008" "wicd-1.5.0" +.TH WICD 8 "June 2008" "wicd-%VERSION%" .SH NAME .B Wicd \- Wired and Wireless Network Connection Manager diff --git a/in/wicd=wpath.py.in b/in/wicd=wpath.py.in index 838a5c7..d871d11 100755 --- a/in/wicd=wpath.py.in +++ b/in/wicd=wpath.py.in @@ -17,6 +17,9 @@ current = os.path.dirname(os.path.realpath(__file__)) + '/' # All directory paths *MUST* end in a / +version = '%VERSION%' +revision = '%REVNO%' + # DIRECTORIES lib = '%LIB%' diff --git a/init/arch/wicd b/init/arch/wicd deleted file mode 100755 index 261da61..0000000 --- a/init/arch/wicd +++ /dev/null @@ -1,33 +0,0 @@ -#!/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 - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting wicd Daemon" - killall wicd &> /dev/null - /usr/sbin/wicd-daemon &> /dev/null - add_daemon wicd - stat_done - ;; - stop) - stat_busy "Stopping wicd Daemon" - killall wicd &> /dev/null - rm_daemon wicd - stat_done - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/init/debian/wicd b/init/debian/wicd deleted file mode 100755 index bac259c..0000000 --- a/init/debian/wicd +++ /dev/null @@ -1,159 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: wicd -# Required-Start: dbus -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Starts and stops Wicd -# Description: Starts and stops Wicd, a network manager -### END INIT INFO - -# Author: Adam Blackburn -# - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/usr/sbin:/usr/bin:/sbin:/bin -DESC="Network connection manager" -NAME=wicd -DAEMON=/usr/sbin/$NAME -DAEMON_ARGS="" -PIDFILE=/var/run/wicd/wicd.pid -SCRIPTNAME=/etc/init.d/wicd - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -[ -f /etc/default/rcS ] && . /etc/default/rcS - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# Perhaps not the best idea -# but a confirmation is nice -# when starting/stopping the daemon -VERBOSE=yes - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - # vvvv -- don't do this -- vvvv - # [ -e $PIDFILE ] && return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --startas $DAEMON -- \ - $DAEMON_ARGS > /dev/null 2> /dev/null\ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/init/default/wicd b/init/default/wicd deleted file mode 100644 index b710c28..0000000 --- a/init/default/wicd +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# /etc/init.d/wicd -# Start/stop/restart the Wicd daemon -# Modified the Slackware default init script for use -# where the distro is not detected. - -# This is defined in /usr/lib/python2.5/site-packages/wicd/wpath.py -PIDFILE="/var/run/wicd/wicd.pid" - -# Define start and stop functions - -wicd_start() { - if [ -e $PIDFILE ]; then - echo "Wicd appears to already be running." - echo "If this is not the case, then remove " - echo "$PIDFILE and try again..." - exit 1 - else - echo "Starting wicd daemon..." - /usr/sbin/wicd 2>/dev/null 1>&2 - fi -} - -wicd_stop() { - echo "Stopping wicd daemon..." - if [ -e $PIDFILE ]; then - kill $(cat $PIDFILE) 2>/dev/null - rm -f $PIDFILE 2>/dev/null - else - killall wicd-client 2>/dev/null - fi -} - -# See how we were called and take appropriate action - -case $1 in - start) - wicd_start - ;; - stop) - wicd_stop - ;; - restart) - wicd_stop - wicd_start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - diff --git a/init/gentoo/wicd b/init/gentoo/wicd deleted file mode 100755 index f4083be..0000000 --- a/init/gentoo/wicd +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -opts="start stop restart" - -WICD_DAEMON=/usr/sbin/wicd -WICD_PIDFILE=/var/run/wicd/wicd.pid - -depend() { - need dbus -} - -start() { - ebegin "Starting wicd daemon" - $WICD_DAEMON &>/dev/null - eend $? -} - -stop() { - ebegin "Stopping wicd daemon" - start-stop-daemon --stop --pidfile "$WICD_PIDFILE" - eend $? -} diff --git a/init/pld/wicd b/init/pld/wicd deleted file mode 100755 index cd5e684..0000000 --- a/init/pld/wicd +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# -# wicd wicd wireless connection daemon -# -# chkconfig: 345 99 01 -# -# description: wicd wireless connection daemon -# -# processname: wicd -# config: -# pidfile: /var/run/wicd.pid -# -# $Id: template.init 9689 2008-03-27 16:15:39Z patrys $ - -# Source function library -. /etc/rc.d/init.d/functions - - -# Get service config - may override defaults -# [ -f /etc/sysconfig/wicd ] && . /etc/sysconfig/wicd - -WICD_BIN=/usr/sbin/wicd - -start() { - # Check if the service is already running? - if [ ! -f /var/lock/subsys/wicd ]; then - msg_starting wicd - daemon $WICD_BIN - RETVAL=$? - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/wicd - else - msg_already_running wicd - fi -} - -stop() { - if [ -f /var/lock/subsys/wicd ]; then - # Stop daemons. - msg_stopping wicd - # killproc wicd - killproc --pidfile /var/run/wicd.pid wicd -TERM - rm -f /var/lock/subsys/wicd - else - msg_not_running wicd - fi -} - - -condrestart() { - if [ -f /var/lock/subsys/wicd ]; then - stop - start - else - msg_not_running wicd - RETVAL=$1 - fi -} - -RETVAL=0 -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - try-restart) - condrestart 0 - ;; -# use this one if program doesn't support reloading without restart - force-reload) - condrestart 7 - ;; - status) - status wicd - RETVAL=$? - ;; - *) - msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|status}" - exit 3 -esac - -exit $RETVAL diff --git a/init/redhat/wicd b/init/redhat/wicd deleted file mode 100755 index ec9c6c1..0000000 --- a/init/redhat/wicd +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh -# -# /etc/init.d/wicd -# -# chkconfig: - 98 02 -# description: Wicd is a wireless and wired network manager for Linux. - -# Source function library. -. /etc/rc.d/init.d/functions - -# This script was borrowed from the Wicd wiki page on building for Fedora -# http://wicd.net/wiki/doku.php?id=fedora - -WICD_BIN=/usr/sbin/wicd - -case "$1" in - start) - echo -n "Starting wicd services: " - daemon $WICD_BIN 2> /dev/null - touch /var/lock/subsys/wicd - ;; - stop) - echo -n "Shutting down wicd services: " - killall wicd 2> /dev/null - rm -f /var/lock/subsys/wicd - ;; - status) - if pidofproc wicd > /dev/null ; then - echo "wicd is running." - else - status wicd - fi - ;; - restart | reload) - $0 stop - $0 start - ;; - *) - echo "Usage: wicd {start|stop|status|reload|restart}" - exit 1 - ;; -esac - diff --git a/init/slackware/rc.wicd b/init/slackware/rc.wicd deleted file mode 100755 index aef7d58..0000000 --- a/init/slackware/rc.wicd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh - -# /etc/rc.d/rc.wicd -# Start/stop/restart the Wicd daemon - -# This is defined in /usr/lib/python2.5/site-packages/wicd/wpath.py -PIDFILE="/var/run/wicd/wicd.pid" - -# Define start and stop functions - -wicd_start() { - if [ -e $PIDFILE ]; then - echo "Wicd appears to already be running." - echo "If this is not the case, then remove " - echo "$PIDFILE and try again..." - exit 1 - else - echo "Starting wicd daemon..." - wicd 2>/dev/null 1>&2 - fi -} - -wicd_stop() { - echo "Stopping wicd daemon..." - if [ -e $PIDFILE ]; then - kill $(cat $PIDFILE) 2>/dev/null - rm -f $PIDFILE 2>/dev/null - else - pkill -f python.*wicd-daemon.py 2>/dev/null - fi -} - -# See how we were called and take appropriate action - -case $1 in - start) - wicd_start - ;; - stop) - wicd_stop - ;; - restart) - wicd_stop - wicd_start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - - diff --git a/init/suse/wicd b/init/suse/wicd deleted file mode 100755 index f89775e..0000000 --- a/init/suse/wicd +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh - -### BEGIN INIT INFO -# Provides: wicd-daemon -# Required-Start: dbus -# Default-Start: 3 4 5 -# Default-Stop: -# Description: wicd, a wired and wireless connection manager. -### END INIT INFO - -WICD_BIN=/usr/sbin/wicd -test -x $WICD_BIN || exit 5 - -. /etc/rc.status -rc_reset - -case "$1" in - start) - checkproc $WICD_BIN - if [ $? = 0 ]; then - echo -n "wicd already running" - rc_status -v - rc_exit - fi - echo -n "Starting wicd" - startproc $WICD_BIN - rc_status -v - ;; - stop) - echo -n "Shutting down wicd" - killproc -TERM $WICD_BIN - rc_status -v - ;; - restart) - $0 stop - $0 start - rc_status - ;; - status) - echo -n "Checking for wicd: " - checkproc $WICD_BIN - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status|restart}" - exit 1 - ;; -esac - - diff --git a/man/wicd-manager-settings.conf.5 b/man/wicd-manager-settings.conf.5 deleted file mode 100644 index 73c9f4b..0000000 --- a/man/wicd-manager-settings.conf.5 +++ /dev/null @@ -1,91 +0,0 @@ -.\" Written by Robby Workman -.TH WICD-MANAGER-SETTINGS.CONF 5 "June 2008" "wicd-1.5.0" -.SH NAME -wicd-manager-settings.conf \- contains settings that control Wicd's behavior - -.SH DESCRIPTION - -This file contains general configuration information for Wicd. -.br -This file is located at /etc/wicd/manager-settings.conf - -.SH SETTINGS - -.TP -.BI "link_detect_tool = " <0|1|2> -0 = autodetect -.br -1 = ethtool -.br -2 = mii-tool -.TP -.BI "flush_tool = " <0|1|2> -0 = autodetect -.br -1 = ip -.br -2 = route -.TP -.BI "signal_display_type = " <0|1> -0 = Show signal strength as a percentage -.br -1 = Show signal strength in dBm -.TP -.BI "dhcp_client = " <0|1|2|3> -0 = autodetect -.br -1 = dhclient -.br -2 = dhcpcd -3 = pump -.TP -.BI "wired_interface = " -.TP -.BI "always_show_wired_interface = " -.TP -.BI "wired_connect_mode = " <0|1> -0 = connect to wired interface automatically -.br -1 = do not connect to wired interface automatically -.TP -.BI "wireless_interface = " -.TP -.BI "wpa_driver = " -The default (and best supported) is wext. It should work properly in most cases. -.TP -.BI "auto_reconnect = " -This settings determines whether Wicd will attempt to reconnect on connection loss. -.TP -.BI "use_global_dns = " -If set to "True" and values are specified in the global DNS settings below, -this will cause Wicd to use these DNS settings. -.TP -.BI "global_dns_1 = " -.TP -.BI "global_dns_2 = " -.TP -.BI "global_dns_3 = " -.TP -.BI "debug_mode = " -0 = disabled -.br -1 = enabled -.TP -.BI "window_height = " " (in pixels)" -This determines the height of the client window. -.TP -.BI "window_width = " " (in pixels)" -This determines the width of the client window. -.TP -.BI "pref_height = " " (in pixels)" -This determines the height of the "Preferences" window when launched from the client. -.TP -.BI "pref_width = " " (in pixels)" -This determines the width of the "Preferences" window when launched from the client. - - -.SH "SEE ALSO" -.BR wicd (8), -.BR wicd-wired-settings.conf (5), -.BR wicd-wireless-settings.conf (5). - diff --git a/man/wicd-wired-settings.conf.5 b/man/wicd-wired-settings.conf.5 deleted file mode 100644 index 0aff34e..0000000 --- a/man/wicd-wired-settings.conf.5 +++ /dev/null @@ -1,75 +0,0 @@ -.\" Written by Robby Workman -.TH WICD-WIRED-SETTINGS.CONF 5 "June 2008" "wicd-1.5.0" -.SH NAME -wicd-wired-settings.conf \- controls Wicd's wired network settings - -.SH DESCRIPTION - -This file contains configuration information for wired interfaces in Wicd. -.br -This file is located at /etc/wicd/wired-settings.conf - - -.SH SETTINGS - -.TP -.BI "default = " <0|1> -This option decides whether to use this profile as the default. -0 = do not use this profile as default. -.br -1 = use this profile as default. -.TP -.BI "beforescript = " -This defines a script to run before Wicd brings up the connection. -The script should be a Bourne-compatible script and should be executable. -.br -IMPORTANT - scripts should ONLY be writable by root and located in a -directory that is only writable by root. -.TP -.BI "afterscript = " -This defines a script to run after Wicd brings up the connection. -The script should be a Bourne-compatible script and should be executable. -.br -IMPORTANT - scripts should ONLY be writable by root and located in a -directory that is only writable by root. -.TP -.BI "disconnectscript = " -This defines a script to run when Wicd disconnects the interface. -The script should be a Bourne-compatible script and should be executable. -.br -IMPORTANT - scripts should ONLY be writable by root and located in a -directory that is only writable by root. -.TP -.BI "ip = " -Use this option if you have a static ip address for your system. -.TP -.BI "netmask = " -This setting is only appropriate if a static ip address is configured above. -.TP -.BI "broadcast = " -This setting is only appropriate if a static ip address is configured above. -.TP -.BI "gateway = " -This setting is only appropriate if a static ip address is configured above. -.TP -.BI "use_static_dns = " -True = use static DNS servers instead of accepting what the dhcp server supplies. -.TP -.BI "use_global_dns = " -True = use the global DNS servers provided in wicd-manager-settings.conf(5). -This option is only appropriate if "use_static_dns = True" -.TP -.BI "dns1 = " -Static DNS address if "use_static_dns = True" and "use_global_dns = False" -.TP -.BI "dns2 = " -Static DNS address if "use_static_dns = True" and "use_global_dns = False" -.TP -.BI "dns3 = " -Static DNS address if "use_static_dns = True" and "use_global_dns = False" - -.SH "SEE ALSO" -.BR wicd (8), -.BR wicd-manager-settings.conf (5), -.BR wicd-wireless-settings.conf (5). - diff --git a/man/wicd-wireless-settings.conf.5 b/man/wicd-wireless-settings.conf.5 deleted file mode 100644 index 3662d28..0000000 --- a/man/wicd-wireless-settings.conf.5 +++ /dev/null @@ -1,127 +0,0 @@ -.\" Written by Robby Workman -.TH WICD-WIRELESS-SETTINGS.CONF 5 "June 2008" "wicd-1.5.0" -.SH NAME -wicd-wired-settings.conf \- controls Wicd's wireless network settings - -.SH DESCRIPTION - -This file contains configuration information for wireless interfaces in Wicd. -.br -This file is located at /etc/wicd/wireless-settings.conf - - -.SH SETTINGS - -.TP -.BI "bssid = " -This value can be found using iwconfig(8). -.TP -.BI "essid = " -This value can be found using iwconfig(8). -.TP -.BI "hidden = " -This option notes whether the network's ESSID is broadcast or not. -.TP -.BI "channel = " -Valid channels are dependent upon country. -.br -This value can be found using iwconfig(8). -.TP -.BI "mode = " -.br -This value can be found using iwconfig(8). -.TP -.BI "enctype = " -This can take the value of any encryption template shown in /etc/wicd/encryption/templates/. -.TP -.BI "encryption_method = "WEP|WPA|WPA2> -This value can be found using iwconfig(8). -.TP -.BI "key = " -Be sure this file is readable only by root. -.TP -.BI "automatic = " -This option determines whether Wicd should automatically connect to this -network. -.TP -.BI "ip = " -Use this option if you have a static ip address for your system. -.TP -.BI "netmask = " -This setting is only appropriate if a static ip address is configured above. -.TP -.BI "broadcast = " -This setting is only appropriate if a static ip address is configured above. -.TP -.BI "gateway = " -This setting is only appropriate if a static ip address is configured above. -.TP -.BI "use_static_dns = " -True = use static DNS servers instead of accepting what the dhcp server supplies. -.TP -.BI "use_global_dns = " -True = use the global DNS servers provided in wicd-manager-settings.conf(5). -.br -This option is only appropriate if "use_static_dns = True" -.TP -.BI "dns1 = " -Static DNS address if "use_static_dns = True" and "use_global_dns = False" -.TP -.BI "dns2 = " -Static DNS address if "use_static_dns = True" and "use_global_dns = False" -.TP -.BI "dns3 = " -Static DNS address if "use_static_dns = True" and "use_global_dns = False" -.TP -.BI "use_settings_globally = " <0|1> -Wicd keeps track of whether to autoconnect to networks based on bssid. -This ensures that you don't accidentally connect to another network that is -not yours but happens to have the same essid - for example, there are a lot -of commercial routers in use with "linksys" as the essid. -.br -0 = Do not use settings globally -.br -1 = Use settings globally -.TP -.BI "has_profile = " -This parameter is used internally by Wicd and has no effect as far as the -user is concerned. -.TP -.BI "beforescript = " -This defines a script to run before Wicd brings up the connection. -.br -IMPORTANT - scripts should ONLY be writable by root and should be located -in a directory that is writable by only root. -.TP -.BI "afterscript = " -This defines a script to run after Wicd brings up the connection. -.br -IMPORTANT - scripts should ONLY be writable by root and located -in a directory that is writable by only root. -.TP -.BI "disconnectscript = " -This defines a script to run when Wicd disconnects the interface. -.br -IMPORTANT - scripts should ONLY be writable by root and located -in a directory that is writable by only root. - - - -.SH OTHER -The "use_settings_globally" option determines how an individual network's -configuration stanza starts. If the option is "0" (do not use settings -globally), then the stanza's top line will be the bssid of the access -point (in this format): -.br -[00:15:3E:87:D3:68] -.br -If the "option is set to "1" (use settings globally), then the first line -of the stanza will be in this format: -.br -[essid:UA Public Wireless Network] - -.SH "SEE ALSO" -.BR wicd (8), -.BR wicd-manager-settings.conf (5), -.BR wicd-wired-settings.conf (5). - diff --git a/man/wicd.8 b/man/wicd.8 deleted file mode 100644 index 39d7031..0000000 --- a/man/wicd.8 +++ /dev/null @@ -1,161 +0,0 @@ -.\" Written by Robby Workman -.TH WICD 8 "June 2008" "wicd-1.5.0" -.SH NAME -.B Wicd -\- Wired and Wireless Network Connection Manager - -.SH THEORY OF OPERATION - -Wicd is designed to give the user as much control over behavior of network -connections as possible. Every network, both wired and wireless, has its -own profile with its own configuration options and connection behavior. -Wicd will try to automatically connect only to networks the user specifies -it should try, with a preference first to a wired network, then to wireless. - -For wired connections, users have many options for determining what network -settings to use. Wicd allows creation of an unlimited number of wired -profiles, each of which has its own unique settings. The user can choose to -automatically connect to a selected default profile, choose a profile from a -pop-up window every time wicd connects, or have wicd automatically choose the -last profile used to manually connect. - -For wireless connections, users can select any number of wireless networks -to automatically connect; wicd will choose the one with the highest signal -strength to try to connect. - -If the user chooses, wicd will try to automatically reconnect when it detects -that a connection is lost. If the last known connection state is wired, wicd -will first try to reconnect to the wired network, and if it is not available, -wicd will try any available wireless networks which have automatic connection -enabled. If the last known connection state is wireless, wicd will first try -to reconnect to the previously connected network (even if that network does -not have automatic connection enabled), and should that fail, it will try both -a wired connection and any available wireless networks which have automatic -connection enabled. - -Wicd uses built-in linux wireless-tools, such as ifconfig and iwconfig, to -get and configure network info. There is some flexibility in its use of DHCP, -providing support for dhclient, dhcpcd, and pump. Wicd uses wpa_supplicant -to handle all wireless encryption settings, and uses a template-based system -to create the configuration files used by wpa_supplicant. These templates -can be edited, and new templates can be created by the user and imported into -wicd, allowing connection to networks with uncommon encryption settings. - -.SH STRUCTURE - -Wicd has two major parts: the daemon, which runs with root privileges; and the -user interface, which runs with normal user privileges. The two parts run as -separate processes and make use of D-Bus to communicate. - -The daemon is responsible for making and configuring connections, reading and -writing configuration files and logs, and monitoring the connection status. -The daemon's job is split between two processes: wicd-daemon.py and monitor.py. -All the connection status monitoring, as well as the auto-reconnection logic, -takes place in monitor.py. Everthing else is done by wicd-daemon.py. - -The user interface (stored in wicd-client), which is made up of a tray -icon, a main GUI window, and its child dialogs, gets configuration and network -info from the daemon either by querying it using the methods in the daemon's -dbus interface or by receiving signals emitted from the daemon over D-Bus. -Any configuration changes made in the user interface are passed back to the -daemon, which actually applies the changes and writes them to configuration -files. - -Since the user interface just queries for connection and configuration info -from the daemon, it is possible to run wicd without the GUI at all. Also, -the daemon is started by wicd's init script during system startup (before any -user logs in), making it possible to use wicd with "headless" machines. - -.SH USAGE HINTS - -.B Choosing Alternate Tools -.br -Wicd supports several alternatives regarding the networking tools on linux. -In the "External Programs" tab of the Preferences menu, you can choose your -preferred DHCP client, link detection tool, and routing tool if the defaults -aren't suitable for your particular distribution or system. - -.B Custom Scripts -.br -If you need to run any custom commands before or after connecting to or -disconnecting from a network, Wicd supports this; however, you will need to -have a graphical sudo helper installed (currently supported are kdesu, gksu, -and ktsuss). -.br -If you do not have a graphical sudo helper installed, you still have the -ability to use custom scripts, but you will have to set them up manually. -See wicd-wired-settings.conf(5) and/or wicd-wireless-settings.conf(5) for -more information on how to do so. - -.B Automatically Connecting to Networks -.br -Wicd uses the BSSID to recognize a particular network (and thus to decide -whether it should automatically connect to it). If you are on a network -that has many different access points which all have the same ESSID -(many universities have such networks), there is an option in the "Advanced -Settings" to "Use these settings for all networks sharing this essid." -With this option enabled, Wicd will autoconnect to that network, regardless -of which node it sees. - - -.SH FILES - -.B /etc/wicd/manager-settings.conf -.br -This file contains global settings for Wicd. -.br -See this file's own man page for more information about it. - -.B /etc/wicd/wired-settings.conf -.br -This file contains settings related to the wired interface. -.br -See this file's own man page for more information about it. - -.B /etc/wicd/wireless-settings.conf -.br -This file contains settings related to the wireless interface. -.br -See this file's own man page for more information about it. - -.B /etc/wicd/encryption/templates/ -.br -This directory contains various templates for encrypted (WEP, WPA, etcetera) -connections. If none of them fit your needs, you may create your own and -add it to this directory. If you do this, please contact the authors -(see below) of Wicd. - -.B /var/lib/wicd/configurations/ -.br -This directory contains individual configuration files for each encrypted -network you set up in Wicd. - -.B /var/log/wicd/ -.br -This directory contains logfiles of Wicd's activity. Please refer to the -log if you are having connection or other problems. - -.SH "SEE ALSO" -.BR wicd-manager-settings.conf (5), -.BR wicd-wired-settings.conf (5), -.BR wicd-wireless-settings.conf (5), -.BR ifconfig (8), -.BR iwconfig (8), -.BR wpa_supplicant (8), -.BR route (8), -.BR ip (8), -.BR mii-tool (8), -.BR ethtool (8), -.BR dhclient (8), -.BR dhcpcd (8), -.BR pump (8). - - -.SH WICD AUTHORS -Adam Blackburn -.br -Dan O'Reilly - -.SH MANPAGE AUTHOR -Robby Workman - diff --git a/other/postinst b/other/postinst deleted file mode 100755 index a64d480..0000000 --- a/other/postinst +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -# Stop daemon -if [ -f /etc/init.d/wicd ]; then - /etc/init.d/wicd stop -fi - -# Remove Wicd from the boot sequence -if which update-rc.d &>/dev/null ; then - update-rc.d -f wicd remove -fi - -# Remove pyc files -# They may exist if you are upgrading Wicd -rm -f /opt/wicd/*.pyc - -# Add Wicd to the startup sequence -# 80 to make sure that dbus is running when Wicd starts -if which update-rc.d &>/dev/null ; then - update-rc.d wicd start 80 2 3 4 5 . stop 20 0 1 6 . -fi - -# Start the daemon -if [ -f /etc/init.d/wicd ]; then - /etc/init.d/wicd start -fi diff --git a/scripts/wicd b/scripts/wicd deleted file mode 100755 index 96f1458..0000000 --- a/scripts/wicd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -exec python -O /usr/lib/wicd/wicd-daemon.py $@ diff --git a/scripts/wicd-client b/scripts/wicd-client deleted file mode 100755 index 37005c1..0000000 --- a/scripts/wicd-client +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec python -O /usr/lib/wicd/wicd-client.py $@ diff --git a/setup.py b/setup.py index 16644e5..cecaf77 100755 --- a/setup.py +++ b/setup.py @@ -24,6 +24,19 @@ import sys # Be sure to keep this updated! # VERSIONNUMBER VERSION_NUM = '1.6.0' +REVISION_NUM = 'unknown' + +try: + if not os.path.exists('vcsinfo.py'): + try: + os.system('bzr version-info --python > vcsinfo.py') + except: + pass + import vcsinfo + REVISION_NUM = vcsinfo.version_info['revno'] +except Exception, e: + print 'failed to find revision number:' + print e class configure(Command): description = "configure the paths that Wicd will be installed to" @@ -213,6 +226,10 @@ class configure(Command): for line in item_in.readlines(): for item, value in values: line = line.replace('%' + str(item.upper().replace('-','_')) + '%', str(value)) + + # other things to replace that aren't arguments + line = line.replace('%VERSION%', str(VERSION_NUM)) + line = line.replace('%REVNO%', str(REVISION_NUM)) item_out.write(line) @@ -220,6 +237,31 @@ class configure(Command): item_in.close() shutil.copymode(original_name, final_name) +class cleargenerated(Command): + description = 'clears out files generated by configure' + + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + print 'Removing completed template files...' + for item in os.listdir('in'): + if item.endswith('.in'): + print 'Removing completed',item, + original_name = os.path.join('in',item) + final_name = item[:-3].replace('=','/') + print final_name, '...', + if os.path.exists(final_name): + os.remove(final_name) + print 'Removed.' + else: + print 'Does not exist.' + class test(Command): description = "run Wicd's unit tests" @@ -371,7 +413,7 @@ iwscan_ext = Extension(name = 'iwscan', libraries = ['iw'], sources = ['depends/python-iwscan/pyiwscan.c']) -setup(cmdclass={'configure' : configure, 'get_translations' : get_translations, 'uninstall' : uninstall, 'test' : test}, +setup(cmdclass={'configure' : configure, 'get_translations' : get_translations, 'uninstall' : uninstall, 'test' : test, 'cleargenerated' : cleargenerated}, name="Wicd", version=VERSION_NUM, description="A wireless and wired network manager", diff --git a/wicd/wicd-client.py b/wicd/wicd-client.py index dab3f39..a74429a 100755 --- a/wicd/wicd-client.py +++ b/wicd/wicd-client.py @@ -632,14 +632,14 @@ class TrayIcon(object): def usage(): """ Print usage information. """ print """ -wicd 1.50 +wicd %s wireless (and wired) connection daemon front-end. Arguments: \t-n\t--no-tray\tRun wicd without the tray icon. \t-h\t--help\t\tPrint this help information. \t-a\t--no-animate\tRun the tray without network traffic tray animations. -""" +""" % wpath.version def setup_dbus(force=True): global bus, daemon, wireless, wired, DBUS_AVAIL diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index 083884e..36609a8 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -132,8 +132,7 @@ class WicdDaemon(dbus.service.Object): anything >= 0. This number is effective starting wicd v1.2.0. """ - version = '1.6.0' - return version + return wpath.version @dbus.service.method('org.wicd.daemon') def SetWiredInterface(self, interface): @@ -1447,7 +1446,7 @@ class WiredDaemon(dbus.service.Object): def usage(): print """ -wicd 1.6.0 +wicd %s wireless (and wired) connection daemon. Arguments: @@ -1457,7 +1456,7 @@ Arguments: \t-n\t--no-poll\tDon't monitor network status. \t-o\t--no-stdout\tDon't redirect stdout. \t-h\t--help\t\tPrint this help. -""" +""" % (wpath.version + ' (bzr-r%s)' % wpath.revision) def daemonize(): """ Disconnect from the controlling terminal. diff --git a/wicd/wpath.py b/wicd/wpath.py deleted file mode 100755 index 6afec6c..0000000 --- a/wicd/wpath.py +++ /dev/null @@ -1,72 +0,0 @@ -""" Path configuration and functions for the wicd daemon and gui clients. - -chdir() -- Change directory to the location of the current file. - -""" - -import os - -# The path containing the wpath.py file. -current = os.path.dirname(os.path.realpath(__file__)) + '/' - -# These paths can easily be modified to handle system wide installs, or -# they can be left as is if all files remain with the source directory -# layout. - -# These paths are replaced when setup.py configure is run - -# All directory paths *MUST* end in a / - -# DIRECTORIES - -lib = '/usr/lib/wicd/' -share = '/usr/share/wicd/' -etc = '/etc/wicd/' -images = '/usr/share/pixmaps/wicd/' -encryption = '/etc/wicd/encryption/templates/' -bin = '/usr/bin/' -networks = '/var/lib/wicd/configurations/' -log = '/var/log/wicd/' -resume = '/etc/acpi/resume.d/' -suspend = '/etc/acpi/suspend.d/' -sbin = '/usr/sbin/' -pmutils = '/usr/lib/pm-utils/sleep.d/' -dbus = '/etc/dbus-1/system.d/' -desktop = '/usr/share/applications/' -backends= '/usr/lib/wicd/backends/' -translations = '/usr/share/locale/' -icons = '/usr/share/icons/hicolor/' -autostart = '/etc/xdg/autostart/' -init = '/etc/init.d/' -docdir = '/usr/share/doc/wicd/' -mandir = '/usr/share/man/' -kdedir = '/usr/share/autostart/' - -# FILES - -# python begins the file section -python = '/usr/bin/python' -pidfile = '/var/run/wicd/wicd.pid' -# stores something like other/wicd -# really only used in the install -initfile = 'init/debian/wicd' -# stores only the file name, i.e. wicd -initfilename = 'wicd' - -# BOOLEANS -no_install_pmutils = False -no_install_init = False -no_install_man = False -no_install_kde = False -no_install_acpi = False -no_install_docs = False - -def chdir(file): - """Change directory to the location of the specified file. - - Keyword arguments: - file -- the file to switch to (usually __file__) - - """ - os.chdir(os.path.dirname(os.path.realpath(file))) -