gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-28 01:12:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix up paths, take adventage of data path

Browse Source
This commit is contained in:
gryf
2020-08-27 20:33:05 +02:00
parent 8ddc4ac945
commit 367a9ab74d
33 changed files with 42 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
in/other=wicd.conf.in
View File

@@ -1,47 +0,0 @@
<!-- /etc/dbus-1/system.d/wicd.conf -->
<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<busconfig>
<policy user="root">
<allow own="org.wicd.daemon"/>
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
<allow send_destination="org.wicd.daemon.wireless"/>
<allow send_interface="org.wicd.daemon.wireless"/>
<allow send_destination="org.wicd.daemon.wired"/>
<allow send_interface="org.wicd.daemon.wired"/>
</policy>
<policy context="default">
<deny own="org.wicd.daemon"/>
</policy>
<!-- This Unix group will have permission to use Wicd's gui -->
<policy group="%WICDGROUP%">
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
<allow send_interface="org.freedesktop.DBus.Introspectable"/>
<!-- The Introspectable allow shouldn't be needed here, but
it seems that a few distributions aren't yet allowing
it in their hal configs, and we need it here, so... -->
</policy>
<!-- Comment the block below if you do not want all users logged in
locally to have permission to use wicd-client. This ignores the
group based permission model defined above for the "%WICDGROUP%"
group. Note that this only applies if you are using ConsoleKit -
if you do not have ConsoleKit installed and in use, then this
block makes no difference either way. -->
<policy at_console="true">
<allow send_destination="org.wicd.daemon"/>
<allow send_interface="org.wicd.daemon"/>
<allow send_destination="org.wicd.daemon.wireless"/>
<allow send_interface="org.wicd.daemon.wireless"/>
<allow send_destination="org.wicd.daemon.wired"/>
<allow send_interface="org.wicd.daemon.wired"/>
<allow send_interface="org.freedesktop.DBus.Introspectable"/>
</policy>
</busconfig>

6
in/other=wicd.logrotate.in
View File

@@ -1,6 +0,0 @@
%LOG%wicd.log {
missingok
notifempty
size 30k
create %LOGPERMS% root %LOGGROUP%
}

2
in/scripts=wicd-cli.in
View File

@@ -1,2 +0,0 @@
#!/bin/bash
exec %PYTHON% -O %SHARE%cli/wicd-cli.py $@

45
in/scripts=wicd-client.in
View File

@@ -1,45 +0,0 @@
#!/bin/sh
# check_firstrun()
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
# Make sure the user knows WHEREAREMYFILES ;-)
if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi
if [ "$DISPLAY" = "" ]; then
BOLD=$(tput bold)
BLUE=$(tput setaf 4)
NC=$(tput sgr0)
if [ -x "%BIN%wicd-curses" ]; 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"
printf "for more information about this error and resulting message. \n"
printf "\n"
printf "This message will not be displayed again. \n"
printf "Press enter to continue... \n"
read _junk
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.
If you delete this file, then wicd-client will print the warning if it is
launched outside of X (and then recreate this file again).
EOF
fi
exec %BIN%wicd-curses $@
else
printf "NOTICE: You do not have an X server active on this console, \n"
printf "but you do not appear to have ${BOLD}${BLUE}wicd-curses${NC}\n"
printf "installed on this system. We'd normally be running it here.\n"
printf "Please see the wicd-client manual page for more information.\n"
fi
else
exec %BIN%wicd-gtk $@
fi

9
in/scripts=wicd-curses.in
View File

@@ -1,9 +0,0 @@
#!/bin/sh
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
if [ -e "%VARLIB%WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
ln -s "%VARLIB%WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi
exec %PYTHON% -O %SHARE%curses/wicd-curses.py $@

12
in/scripts=wicd-gtk.in
View File

@@ -1,12 +0,0 @@
#!/bin/sh
# check_firstrun()
if [ ! -d "$HOME/.wicd" ]; then
mkdir -p "$HOME/.wicd"
fi
# Make sure the user knows WHEREAREMYFILES ;-)
if [ -e "/var/lib/wicd/WHEREAREMYFILES" ] && [ ! -L "$HOME/.wicd/WHEREAREMYFILES" ]; then
ln -s "/var/lib/wicd/WHEREAREMYFILES" "$HOME/.wicd/WHEREAREMYFILES"
fi
exec %PYTHON% -O %SHARE%gtk/wicd-client.py $@

3
in/scripts=wicd.in
View File

@@ -1,3 +0,0 @@
#!/bin/sh
exec %PYTHON% -O %SHARE%daemon/wicd-daemon.py $@

101
in/wicd=wpath.py.in
View File

@@ -1,101 +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 /
version = '%VERSION%'
revision = '%REVNO%'
curses_revision = '%CURSES_REVNO%'
# DIRECTORIES
lib = '%LIB%'
share = '%SHARE%'
etc = '%ETC%'
scripts = '%SCRIPTS%'
predisconnectscripts = '%SCRIPTS%predisconnect'
postdisconnectscripts = '%SCRIPTS%postdisconnect'
preconnectscripts = '%SCRIPTS%preconnect'
postconnectscripts = '%SCRIPTS%postconnect'
images = '%IMAGES%'
encryption = '%ENCRYPTION%'
bin = '%BIN%'
varlib = '%VARLIB%'
networks = '%NETWORKS%'
log = '%LOG%'
resume = '%RESUME%'
suspend = '%SUSPEND%'
sbin = '%SBIN%'
pmutils = '%PMUTILS%'
dbus = '%DBUS%'
dbus_service = '%DBUS_SERVICE%'
systemd = '%SYSTEMD%'
logrotate = '%LOGROTATE%'
desktop = '%DESKTOP%'
backends = '%BACKENDS%'
daemon = '%DAEMON%'
curses = '%CURSES%'
gtk = '%GTK%'
cli = '%CLI%'
gnome_shell_extensions = '%GNOME_SHELL_EXTENSIONS%'
translations = '%TRANSLATIONS%'
icons = '%ICONS%'
pixmaps = '%PIXMAPS%'
autostart = '%AUTOSTART%'
init = '%INIT%'
docdir = '%DOCDIR%'
mandir = '%MANDIR%'
kdedir = '%KDEDIR%'
# FILES
# python begins the file section
python = '%PYTHON%'
pidfile = '%PIDFILE%'
# stores something like other/wicd
# really only used in the install
initfile = '%INITFILE%'
# stores only the file name, i.e. wicd
initfilename = '%INITFILENAME%'
wicd_group = '%WICDGROUP%'
log_group = '%LOGGROUP%'
log_perms = '%LOGPERMS%'
# BOOLEANS
no_install_pmutils = %NO_INSTALL_PMUTILS%
no_install_init = %NO_INSTALL_INIT%
no_install_man = %NO_INSTALL_MAN%
no_install_i18n = %NO_INSTALL_I18N%
no_install_i18n_man = %NO_INSTALL_I18N_MAN%
no_install_kde = %NO_INSTALL_KDE%
no_install_acpi = %NO_INSTALL_ACPI%
no_install_docs = %NO_INSTALL_DOCS%
no_install_gtk = %NO_INSTALL_GTK%
no_install_ncurses = %NO_INSTALL_NCURSES%
no_install_cli = %NO_INSTALL_CLI%
no_install_gnome_shell_extensions = %NO_INSTALL_GNOME_SHELL_EXTENSIONS%
no_use_notifications = %NO_USE_NOTIFICATIONS%
def chdir(f):
"""Change directory to the location of the specified file.
Keyword arguments:
f -- the file to switch to (usually __file__)
"""
os.chdir(os.path.dirname(os.path.realpath(f)))

1
in/wpath.py.in
View File

@@ -1 +0,0 @@
wicd=wpath.py.in