* drop absolute path from configuration

* add configuration from cmake building
* update submodules
This commit is contained in:
arcan1s
2015-06-27 05:10:56 +03:00
parent aed09bf798
commit 5018232c08
21 changed files with 209 additions and 116 deletions

View File

@ -18,13 +18,16 @@ add_subdirectory (${SUBPROJECT_SOURCE_DIR})
# build man
file (GLOB SUBPROJECT_MAN_IN *.1)
file (GLOB SUBPROJECT_MAN5_IN *.5)
file (GLOB SUBPROJECT_CONF_IN netctl-gui.conf)
file (RELATIVE_PATH SUBPROJECT_MAN ${CMAKE_SOURCE_DIR} ${SUBPROJECT_MAN_IN})
file (RELATIVE_PATH SUBPROJECT_MAN5 ${CMAKE_SOURCE_DIR} ${SUBPROJECT_MAN5_IN})
file (RELATIVE_PATH SUBPROJECT_CONF ${CMAKE_SOURCE_DIR} ${SUBPROJECT_CONF_IN})
configure_file (${SUBPROJECT_MAN_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN})
configure_file (${SUBPROJECT_MAN5_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5})
configure_file (${SUBPROJECT_CONF_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_CONF})
install (FILES org.netctlgui.helper.conf DESTINATION ${DBUS_SYSTEMCONF_PATH})
install (FILES netctl-gui.conf DESTINATION /etc)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_CONF} DESTINATION /etc)
install (FILES netctlgui-helper.service DESTINATION ${SYSTEMD_SERVICE_PATH})
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN} DESTINATION share/man/man1/)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5} DESTINATION share/man/man5/)

View File

@ -5,81 +5,81 @@
[Common]
# application language
LANGUAGE=en
#LANGUAGE="@CFG_LANGUAGE@"
# auto update interval for main tab in seconds
# 0 means there is no updates
MAINUPDATE=0
#MAINUPDATE="@CFG_MAINUPDATE@"
# auto update interval for wifi tab in seconds
# 0 means there is no updates
WIFIUPDATE=0
#WIFIUPDATE="@CFG_WIFIUPDATE@"
# create system tray icon.
# This option is not recognized by netctlgui-helper
SYSTRAY=true
#SYSTRAY="@CFG_SYSTRAY@"
# close helper after GUI application quit.
# This option is not recognized by netctlgui-helper
CLOSETOTRAY=true
#CLOSETOTRAY="@CFG_CLOSETOTRAY@"
# start netctl-gui minimized to tray if it is available.
# This option is not recognized by netctlgui-helper
STARTTOTRAY=false
#STARTTOTRAY="@CFG_STARTTOTRAY@"
# skip external components checking
# This option is not recognized by netctlgui-helper
SKIPCOMPONENTS=false
#SKIPCOMPONENTS="@CFG_SKIPCOMPONENTS@"
[Helper]
# use netctlgui-helper if it is available.
# This option is not recognized by netctlgui-helper
USE_HELPER=true
#USE_HELPER="@CFG_USE_HELPER@"
# force use SUDO_PATH for helper instead of using setuid(3) to child processes
FORCE_SUDO=false
#FORCE_SUDO="@CFG_FORCE_SUDO@"
# hide application to tray on exit if tray is available.
# This option is not recognized by netctlgui-helper
CLOSE_HELPER=false
#CLOSE_HELPER="@CFG_CLOSE_HELPER@"
# path to netctlgui-helper.
# This option is not recognized by netctlgui-helper
HELPER_PATH=/usr/bin/netctlgui-helper
#HELPER_PATH="@CFG_HELPER_PATH@"
# netctlgui-helper service name.
# This option is not recognized by netctlgui-helper
HELPER_SERVICE=netctlgui-helper.service
#HELPER_SERVICE="@CFG_HELPER_SERVICE@"
[netctl]
# path to systemctl
SYSTEMCTL_PATH=/usr/bin/systemctl
#SYSTEMCTL_PATH="@CFG_SYSTEMCTL_PATH@"
# path to netctl
NETCTL_PATH=/usr/bin/netctl
#NETCTL_PATH="@CFG_NETCTL_PATH@"
# path to netctl-auto
NETCTLAUTO_PATH=/usr/bin/netctl-auto
#NETCTLAUTO_PATH="@CFG_NETCTLAUTO_PATH@"
# netctl-auto service name without .service suffix
NETCTLAUTO_SERVICE=netctl-auto
#NETCTLAUTO_SERVICE="@CFG_NETCTLAUTO_SERVICE@"
# path to netctl profile directory
PROFILE_DIR=/etc/netctl/
#PROFILE_DIR="@CFG_PROFILE_DIR@"
[sudo]
# path to sudo frontend
SUDO_PATH=/usr/bin/sudo
#SUDO_PATH="@CFG_SUDO_PATH@"
[wpa_supplicant]
# path to wpa_supplicant
WPASUP_PATH=/usr/bin/wpa_supplicant
#WPASUP_PATH="@CFG_WPASUP_PATH@"
# path to wpa_cli
WPACLI_PATH=/usr/bin/wpa_cli
#WPACLI_PATH="@CFG_WPACLI_PATH@"
# wpa_supplicant PID file
# $i is interface
PID_FILE=/run/wpa_supplicant_$i.pid
#PID_FILE="@CFG_PID_FILE@"
# wpa_supplicant drivers for wireless interface comma separated
WPA_DRIVERS="nl80211,wext"
#WPA_DRIVERS="@CFG_WPA_DRIVERS@"
# path to control directory which is required by wpa_supplicant
CTRL_DIR=/run/wpa_supplicant
#CTRL_DIR="@CFG_CTRL_DIR@"
# group which is owner of CTRL_DIR
CTRL_GROUP=users
#CTRL_GROUP="@CFG_CTRL_GROUP@"
[Other]
# path to external editor
# This option is not recognized by netctlgui-helper
EDITOR_PATH=/usr/bin/gvim
#EDITOR_PATH="@CFG_EDITOR_PATH@"
# path to directory which contains interface information
IFACE_DIR=/sys/class/net/
#IFACE_DIR="@CFG_IFACE_DIR@"
# path to directory with rfkill devices.
# This option is not recognized by netctlgui-helper
RFKILL_DIR=/sys/class/rfkill/
#RFKILL_DIR="@CFG_RFKILL_DIR@"
# prefered wireless interface
PREFERED_IFACE=
#PREFERED_IFACE="@CFG_PREFERED_IFACE@"

View File

@ -32,10 +32,10 @@ force use
for helper instead of using
.BR setuid (3)
to child processes
.IP "EDITOR_PATH=/usr/bin/gvim"
.IP "EDITOR_PATH=gvim"
path to an external editor. This option is not recognized by
.BR netctlgui-helper (1)
.IP "HELPER_PATH=/usr/bin/netctlgui-helper"
.IP "HELPER_PATH=netctlgui-helper"
path to
.BR netctlgui-helper (1)
This option is not recognized by
@ -50,10 +50,10 @@ path to directory which contains interface information
application language
.IP "MAINUPDATE=0"
main tab autoupdate interval in seconds. 0 is disable autoupdate
.IP "NETCTL_PATH=/usr/bin/netctl"
.IP "NETCTL_PATH=netctl"
path to
.BR netctl (1)
.IP "NETCTLAUTO_PATH=/usr/bin/netctl-auto"
.IP "NETCTLAUTO_PATH=netctl-auto"
path to
.BR netctl-auto (1)
.IP "NETCTLAUTO_SERVICE=netctl-auto"
@ -83,11 +83,11 @@ start
.BR netctl-gui (1)
minimized to tray if it is available. This option is not recognized by
.BR netctlgui-helper (1)
.IP "SUDO_PATH=/usr/bin/kdesu"
.IP "SUDO_PATH=kdesu"
path to
.BR sudo (8)
frontend
.IP "SYSTEMCTL_PATH=/usr/bin/systemctl"
.IP "SYSTEMCTL_PATH=systemctl"
path to
.BR systemctl (1)
.IP "SYSTRAY=true"
@ -100,10 +100,10 @@ if it is available. This option is not recognized by
.BR netctlgui-helper (1)
.IP "WIFIUPDATE=0"
WiFi tab autoupdate interval in seconds. 0 is disable autoupdate
.IP "WPACLI_PATH=/usr/bin/wpa_cli"
.IP "WPACLI_PATH=wpa_cli"
path to
.BR wpa_cli (8)
.IP "WPASUP_PATH=/usr/bin/wpa_supplicant"
.IP "WPASUP_PATH=wpa_supplicant"
path to
.BR wpa_supplicant (8)
.IP "WPA_DRIVERS=nl80211,wext"