removed install scripts

This commit is contained in:
arcan1s
2014-03-25 12:00:34 +04:00
parent 6132de0951
commit 20e744d3cd
8 changed files with 6 additions and 31 deletions

View File

@ -8,7 +8,7 @@ cmake_policy (SET CMP0015 NEW)
project (netctl-plasmoid)
set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 0)
set (PROJECT_VERSION_PATCH 0)
set (PROJECT_VERSION_PATCH 1)
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
@ -18,7 +18,6 @@ message (STATUS "Version: ${PROJECT_VERSION}")
option (BUILD_GUI "Build GUI" ON)
option (BUILD_DATAENGINE "Build data engine" ON)
option (BUILD_PLASMOID "Build plasmoid" ON)
option (BUILD_SCRIPTS "Build special scripts" ON)
# flags
if (CMAKE_COMPILER_IS_GNUCXX)
@ -44,6 +43,3 @@ endif ()
if (BUILD_PLASMOID)
add_subdirectory (plasmoid)
endif ()
if (BUILD_SCRIPTS)
add_subdirectory (scripts)
endif()

View File

@ -246,14 +246,14 @@ QMap<QString, QString> SettingsWindow::getDefault()
settings[QString("CTRL_GROUP")] = QString("users");
settings[QString("IFACE_DIR")] = QString("/sys/class/net/");
settings[QString("LANGUAGE")] = QString("english");
settings[QString("NETCTL_PATH")] = QString("/usr/bin/netctl-gui-netctl");
settings[QString("NETCTL_PATH")] = QString("/usr/bin/netctl");
settings[QString("PID_FILE")] = QString("/run/wpa_supplicant_netctl-gui.pid");
settings[QString("PREFERED_IFACE")] = QString("");
settings[QString("PROFILE_DIR")] = QString("/etc/netctl/");
settings[QString("RFKILL_DIR")] = QString("/sys/class/rfkill/");
settings[QString("SUDO_PATH")] = QString("/usr/bin/kdesu");
settings[QString("WPACLI_PATH")] = QString("/usr/bin/wpa_cli");
settings[QString("WPASUP_PATH")] = QString("/usr/bin/netctl-gui-wpa_supplicant");
settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant");
settings[QString("WPA_DRIVERS")] = QString("nl80211,wext");
for (int i=0; i<settings.keys().count(); i++)

View File

@ -456,7 +456,7 @@ void Netctl::configChanged()
autoUpdateInterval = cg.readEntry("autoUpdateInterval", 1000);
guiPath = cg.readEntry("guiPath", "/usr/bin/netctl-gui");
netctlPath = cg.readEntry("netctlPath", "/usr/bin/netctl-gui-netctl");
netctlPath = cg.readEntry("netctlPath", "/usr/bin/netctl");
useSudo = cg.readEntry("useSudo", true);
sudoPath = cg.readEntry("sudoPath", "/usr/bin/kdesu -c");
showBigInterface = cg.readEntry("showBigInterface", true);

View File

@ -1,8 +0,0 @@
# set project name
set (SUBPROJECT netctl-gui-scripts)
message (STATUS "Subproject ${SUBPROJECT}")
install (FILES netctl-gui-netctl DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install (FILES netctl-gui-wpa_supplicant DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

View File

@ -1,4 +0,0 @@
#!/bin/bash
/usr/bin/netctl $@

View File

@ -1,4 +0,0 @@
#!/bin/bash
wpa_supplicant $@