diff --git a/PKGBUILD b/PKGBUILD index 53f9e15..6cadde8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ #_build_plasmoid=0 pkgname=netctl-gui -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="Qt4 GUI for netctl. Provides a plasmoid for KDE4" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ optdepends=('kdebase-runtime: sudo support' 'wpa_supplicant: wifi support') source=("https://github.com/arcan1s/netctlplasmoid/releases/download/V.${pkgver}/${pkgname}-${pkgver}-src.tar.xz") install="${pkgname}.install" -md5sums=('bc727268cdc3b9ab7d567a2fe9ad3330') +md5sums=('b2bdfabd96a436823c9d46fc0d58bbe8') # flags _cmakekeys="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release" diff --git a/netctl-gui.install b/netctl-gui.install index e70e70a..029294d 100644 --- a/netctl-gui.install +++ b/netctl-gui.install @@ -1,11 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor 2> /dev/null update-desktop-database -q - cat << EOF -Not to enter a root password you may add following lines to /etc/sudoers: - USERNAME ALL=NOPASSWD: /usr/bin/netctl-gui-netctl - USERNAME ALL=NOPASSWD: /usr/bin/netctl-gui-wpa_supplicant -EOF } post_upgrade() { diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 689042a..fed75c1 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -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() diff --git a/sources/gui/src/settingswindow.cpp b/sources/gui/src/settingswindow.cpp index 4d3d250..e37f2f1 100644 --- a/sources/gui/src/settingswindow.cpp +++ b/sources/gui/src/settingswindow.cpp @@ -246,14 +246,14 @@ QMap 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