From fd57ab0f3deb2d6e9076bb02a7e84a0601e7f3a7 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Sat, 19 Nov 2016 06:22:44 +0100 Subject: [PATCH] fix: project rename --- .exrc | 4 +- .travis.yml | 3 +- CMakeLists.txt | 2 +- README.md | 36 +- bump.sh | 8 +- cmake/build/options.cmake | 2 +- cmake/build/targets.cmake | 4 +- cmake/templates/userconfig.cmake.in | 2 +- config | 379 ------------------ contrib/lemonbuddy-git.aur/.SRCINFO | 27 -- contrib/lemonbuddy-git.aur/PKGBUILD | 47 --- contrib/lemonbuddy.aur/.SRCINFO | 26 -- contrib/lemonbuddy.aur/PKGBUILD | 38 -- .../patches/001-musl-poll.patch | 0 .../patches/002-musl-poll.patch | 0 .../patches/003-musl-poll.patch | 0 .../template | 8 +- examples/CMakeLists.txt | 2 +- examples/config | 4 +- examples/config.cmake | 4 +- include/adapters/alsa.hpp | 4 +- include/adapters/mpd.hpp | 4 +- include/adapters/net.hpp | 4 +- include/common.hpp | 12 +- include/components/bar.hpp | 4 +- include/components/builder.hpp | 4 +- include/components/command_line.hpp | 4 +- include/components/config.hpp | 4 +- include/components/controller.hpp | 4 +- include/components/eventloop.hpp | 4 +- include/components/ipc.hpp | 4 +- include/components/logger.hpp | 12 +- include/components/parser.hpp | 4 +- include/components/signals.hpp | 4 +- include/components/types.hpp | 6 +- include/drawtypes/animation.hpp | 4 +- include/drawtypes/iconset.hpp | 4 +- include/drawtypes/label.hpp | 4 +- include/drawtypes/progressbar.hpp | 4 +- include/drawtypes/ramp.hpp | 4 +- include/modules/backlight.hpp | 4 +- include/modules/battery.hpp | 4 +- include/modules/bspwm.hpp | 4 +- include/modules/counter.hpp | 4 +- include/modules/cpu.hpp | 4 +- include/modules/date.hpp | 4 +- include/modules/fs.hpp | 4 +- include/modules/i3.hpp | 4 +- include/modules/ipc.hpp | 4 +- include/modules/memory.hpp | 4 +- include/modules/menu.hpp | 4 +- include/modules/meta.hpp | 4 +- include/modules/mpd.hpp | 4 +- include/modules/network.hpp | 4 +- include/modules/script.hpp | 4 +- include/modules/temperature.hpp | 4 +- include/modules/text.hpp | 4 +- include/modules/unsupported.hpp | 4 +- include/modules/volume.hpp | 4 +- include/modules/xbacklight.hpp | 4 +- include/modules/xwindow.hpp | 4 +- include/utils/bspwm.hpp | 4 +- include/utils/color.hpp | 4 +- include/utils/command.hpp | 4 +- include/utils/file.hpp | 4 +- include/utils/i3.hpp | 4 +- include/utils/inotify.hpp | 4 +- include/utils/io.hpp | 4 +- include/utils/math.hpp | 4 +- include/utils/memory.hpp | 4 +- include/utils/mixins.hpp | 4 +- include/utils/mtab.hpp | 4 +- include/utils/process.hpp | 4 +- include/utils/scope.hpp | 4 +- include/utils/socket.hpp | 4 +- include/utils/string.hpp | 4 +- include/utils/threading.hpp | 4 +- include/utils/throttle.hpp | 4 +- include/x11/color.hpp | 4 +- include/x11/connection.hpp | 4 +- include/x11/draw.hpp | 4 +- include/x11/ewmh.hpp | 4 +- include/x11/fontmanager.hpp | 4 +- include/x11/graphics.hpp | 4 +- include/x11/icccm.hpp | 4 +- include/x11/randr.hpp | 4 +- include/x11/tray.hpp | 8 +- include/x11/types.hpp | 4 +- include/x11/window.hpp | 4 +- include/x11/wm.hpp | 4 +- include/x11/xembed.hpp | 4 +- include/x11/xlib.hpp | 4 +- include/x11/xresources.hpp | 4 +- include/x11/xutils.hpp | 4 +- man/CMakeLists.txt | 6 +- man/Makefile | 6 +- man/{lemonbuddy.1 => polybar.1} | 20 +- man/{lemonbuddy_config.5 => polybar_config.5} | 14 +- src/adapters/alsa.cpp | 4 +- src/adapters/mpd.cpp | 4 +- src/adapters/net.cpp | 4 +- src/components/bar.cpp | 8 +- src/components/builder.cpp | 4 +- src/components/command_line.cpp | 4 +- src/components/config.cpp | 4 +- src/components/controller.cpp | 4 +- src/components/eventloop.cpp | 4 +- src/components/ipc.cpp | 4 +- src/components/logger.cpp | 4 +- src/components/parser.cpp | 4 +- src/components/signals.cpp | 4 +- src/drawtypes/animation.cpp | 4 +- src/drawtypes/iconset.cpp | 4 +- src/drawtypes/label.cpp | 4 +- src/drawtypes/progressbar.cpp | 4 +- src/drawtypes/ramp.cpp | 4 +- src/main.cpp | 6 +- src/modules/backlight.cpp | 4 +- src/modules/battery.cpp | 4 +- src/modules/bspwm.cpp | 4 +- src/modules/counter.cpp | 4 +- src/modules/cpu.cpp | 4 +- src/modules/date.cpp | 4 +- src/modules/fs.cpp | 4 +- src/modules/i3.cpp | 4 +- src/modules/ipc.cpp | 4 +- src/modules/memory.cpp | 4 +- src/modules/menu.cpp | 4 +- src/modules/mpd.cpp | 4 +- src/modules/network.cpp | 4 +- src/modules/script.cpp | 4 +- src/modules/temperature.cpp | 4 +- src/modules/text.cpp | 4 +- src/modules/volume.cpp | 4 +- src/modules/xbacklight.cpp | 4 +- src/modules/xwindow.cpp | 4 +- src/utils/bspwm.cpp | 4 +- src/utils/command.cpp | 4 +- src/utils/file.cpp | 4 +- src/utils/i3.cpp | 4 +- src/utils/inotify.cpp | 4 +- src/utils/io.cpp | 4 +- src/utils/process.cpp | 4 +- src/utils/socket.cpp | 4 +- src/utils/string.cpp | 4 +- src/utils/throttle.cpp | 4 +- src/x11/color.cpp | 4 +- src/x11/connection.cpp | 4 +- src/x11/draw.cpp | 4 +- src/x11/ewmh.cpp | 4 +- src/x11/fontmanager.cpp | 4 +- src/x11/graphics.cpp | 4 +- src/x11/icccm.cpp | 4 +- src/x11/randr.cpp | 4 +- src/x11/tray.cpp | 8 +- src/x11/window.cpp | 4 +- src/x11/wm.cpp | 4 +- src/x11/xembed.cpp | 4 +- src/x11/xlib.cpp | 4 +- src/x11/xresources.cpp | 4 +- src/x11/xutils.cpp | 4 +- tests/unit_tests/components/command_line.cpp | 2 +- tests/unit_tests/components/di.cpp | 2 +- tests/unit_tests/components/logger.cpp | 2 +- tests/unit_tests/utils/color.cpp | 2 +- tests/unit_tests/utils/math.cpp | 2 +- tests/unit_tests/utils/memory.cpp | 2 +- tests/unit_tests/utils/scope.cpp | 2 +- tests/unit_tests/utils/string.cpp | 2 +- tests/unit_tests/x11/color.cpp | 2 +- tests/unit_tests/x11/connection.cpp | 2 +- tests/unit_tests/x11/window.cpp | 2 +- 172 files changed, 363 insertions(+), 881 deletions(-) delete mode 100644 config delete mode 100644 contrib/lemonbuddy-git.aur/.SRCINFO delete mode 100644 contrib/lemonbuddy-git.aur/PKGBUILD delete mode 100644 contrib/lemonbuddy.aur/.SRCINFO delete mode 100644 contrib/lemonbuddy.aur/PKGBUILD rename contrib/{lemonbuddy.xbps => polybar.xbps}/patches/001-musl-poll.patch (100%) rename contrib/{lemonbuddy.xbps => polybar.xbps}/patches/002-musl-poll.patch (100%) rename contrib/{lemonbuddy.xbps => polybar.xbps}/patches/003-musl-poll.patch (100%) rename contrib/{lemonbuddy.xbps => polybar.xbps}/template (91%) rename man/{lemonbuddy.1 => polybar.1} (55%) rename man/{lemonbuddy_config.5 => polybar_config.5} (93%) diff --git a/.exrc b/.exrc index a6d9e6f4..8d21ca0b 100644 --- a/.exrc +++ b/.exrc @@ -1,3 +1,3 @@ let &path.='include,src,' -let tag_path='/home/jaagr/.local/src/c++/lemonbuddy/.tags' -set tags+=/home/jaagr/.local/src/c++/lemonbuddy/.tags +let tag_path='/home/jaagr/.local/src/c++/polybar/.tags' +set tags+=/home/jaagr/.local/src/c++/polybar/.tags diff --git a/.travis.yml b/.travis.yml index a15184ff..4e36c6af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -104,9 +104,8 @@ script: make notifications: irc: channels: - - "irc.freenode.net#lemonbuddy" + - "irc.freenode.org#polybar" template: - "%{author} pushed #%{commit} \"%{commit_subject}\" -> %{repository_name}/%{branch}" - "Build #%{build_number}: %{result} // Compare at %{compare_url}" - use_notice: true skip_join: true diff --git a/CMakeLists.txt b/CMakeLists.txt index ea71de81..a93151c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) -project(lemonbuddy C CXX) +project(polybar C CXX) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} diff --git a/README.md b/README.md index dda0b1d5..f51df86d 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Lemonbuddy +# Polybar -[![Build Status](https://travis-ci.org/jaagr/lemonbuddy.svg?branch=master)](https://travis-ci.org/jaagr/lemonbuddy) -[![MIT License](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000?style=plastic)](https://github.com/jaagr/lemonbuddy/blob/master/LICENSE) +[![Build Status](https://travis-ci.org/jaagr/polybar.svg?branch=master)](https://travis-ci.org/jaagr/polybar) +[![MIT License](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000?style=plastic)](https://github.com/jaagr/polybar/blob/master/LICENSE) A fast and easy-to-use tool for creating status bars. -**Lemonbuddy** aims to help users build beautiful and highly customizable status bars +**Polybar** aims to help users build beautiful and highly customizable status bars for their desktop environment, without the need of having a black belt in shell scripting. Heres a few screenshots showing you what it can look like: @@ -15,7 +15,7 @@ Heres a few screenshots showing you what it can look like: [![sample screenshot](http://i.imgur.com/TY5a5r9t.png)](http://i.imgur.com/TY5a5r9.png) Please note that the project still is in early development, so please report any -problems by [creating an issue ticket](https://github.com/jaagr/lemonbuddy/issues/new). +problems by [creating an issue ticket](https://github.com/jaagr/polybar/issues/new). ## Table of Contents @@ -31,7 +31,7 @@ problems by [creating an issue ticket](https://github.com/jaagr/lemonbuddy/issue ## Introduction -The main purpose of **Lemonbuddy** is to help users create awesome status bars. +The main purpose of **Polybar** is to help users create awesome status bars. It has built-in functionality to generate content for the most commonly used widgets, such as: - Window title @@ -49,14 +49,14 @@ It has built-in functionality to generate content for the most commonly used wid - Inter-process messaging - And more... -[See the wiki for more details](https://github.com/jaagr/lemonbuddy/wiki). +[See the wiki for more details](https://github.com/jaagr/polybar/wiki). ## Getting started -If you are using **Arch Linux**, you can install the AUR package [lemonbuddy-git](https://aur.archlinux.org/packages/lemonbuddy-git/) to get the latest version, or -[lemonbuddy](https://aur.archlinux.org/packages/lemonbuddy/) for the latest stable release. If you are using **Void Linux** -you can install the package [lemonbuddy](https://github.com/voidlinux/void-packages/blob/master/srcpkgs/lemonbuddy/template) available in the official xbps repository. +If you are using **Arch Linux**, you can install the AUR package [polybar-git](https://aur.archlinux.org/packages/polybar-git/) to get the latest version, or +[polybar](https://aur.archlinux.org/packages/polybar/) for the latest stable release. If you are using **Void Linux** +you can install the package [polybar](https://github.com/voidlinux/void-packages/blob/master/srcpkgs/polybar/template) available in the official xbps repository. If you create a package for any other distribution, please consider contributing the template. @@ -89,12 +89,12 @@ $ apt-get install cmake cmake-data libboost-dev libfreetype6-dev libxcb1-dev lib ### Building from source -Please [report any problems](https://github.com/jaagr/lemonbuddy/issues/new) you run into when building the project. +Please [report any problems](https://github.com/jaagr/polybar/issues/new) you run into when building the project. ~~~ sh - $ git clone --branch 2.2.8 --recursive https://github.com/jaagr/lemonbuddy - $ mkdir lemonbuddy/build - $ cd lemonbuddy/build + $ git clone --branch 2.2.8 --recursive https://github.com/jaagr/polybar + $ mkdir polybar/build + $ cd polybar/build $ cmake -DCMAKE_BUILD_TYPE=Release .. $ sudo make install ~~~ @@ -108,13 +108,13 @@ There's also a helper script available in the root folder: ### Configuration -Details on how to setup and configure the bar and each module have been moved to [the wiki](https://github.com/jaagr/lemonbuddy/wiki/Configuration). +Details on how to setup and configure the bar and each module have been moved to [the wiki](https://github.com/jaagr/polybar/wiki/Configuration). ~~~ sh # Install the example configuration $ make userconfig # Launch the example bar - $ lemonbuddy example + $ polybar example ~~~ **NOTE:** If the bar output looks odd, it's probably because you're @@ -124,9 +124,9 @@ missing fonts. ### Running -See the wiki page on [how to launch the bar when starting your WM](https://github.com/jaagr/lemonbuddy/wiki/Running-the-app). +See the wiki page on [how to launch the bar when starting your WM](https://github.com/jaagr/polybar/wiki/Running-the-app). ## License -Lemonbuddy is licensed under the MIT license. [See LICENSE for more information](https://github.com/jaagr/lemonbuddy/blob/master/LICENSE). +Polybar is licensed under the MIT license. [See LICENSE for more information](https://github.com/jaagr/polybar/blob/master/LICENSE). diff --git a/bump.sh b/bump.sh index 6bf579fe..da56f533 100755 --- a/bump.sh +++ b/bump.sh @@ -18,12 +18,12 @@ tag_prev="${tag_curr%.*}.$((tag_curr_patch-1))" sed -r "s/${tag_prev}/${tag_curr}/g" -i \ README.md CMakeLists.txt \ - contrib/lemonbuddy.aur/PKGBUILD contrib/lemonbuddy.aur/.SRCINFO \ - contrib/lemonbuddy-git.aur/PKGBUILD contrib/lemonbuddy-git.aur/.SRCINFO + contrib/polybar.aur/PKGBUILD contrib/polybar.aur/.SRCINFO \ + contrib/polybar-git.aur/PKGBUILD contrib/polybar-git.aur/.SRCINFO git add -u README.md CMakeLists.txt \ - contrib/lemonbuddy.aur/PKGBUILD contrib/lemonbuddy.aur/.SRCINFO \ - contrib/lemonbuddy-git.aur/PKGBUILD contrib/lemonbuddy-git.aur/.SRCINFO \ + contrib/polybar.aur/PKGBUILD contrib/polybar.aur/.SRCINFO \ + contrib/polybar-git.aur/PKGBUILD contrib/polybar-git.aur/.SRCINFO \ include/version.hpp git commit -m "build: Bump version to ${tag_curr}" diff --git a/cmake/build/options.cmake b/cmake/build/options.cmake index e6d61c85..d2f59b4b 100644 --- a/cmake/build/options.cmake +++ b/cmake/build/options.cmake @@ -79,7 +79,7 @@ set(SETTING_PATH_MEMORY_INFO "/proc/meminfo" CACHE STRING "Path to file containing memory info") set(SETTING_PATH_TEMPERATURE_INFO "/sys/class/thermal/thermal_zone%zone%/temp" CACHE STRING "Path to file containing the current temperature") -set(SETTING_PATH_MESSAGING_FIFO "/tmp/lemonbuddy_mqueue.%pid%" +set(SETTING_PATH_MESSAGING_FIFO "/tmp/polybar_mqueue.%pid%" CACHE STRING "Path to file containing the current temperature") # }}} diff --git a/cmake/build/targets.cmake b/cmake/build/targets.cmake index b1703eb4..1361a1f1 100644 --- a/cmake/build/targets.cmake +++ b/cmake/build/targets.cmake @@ -17,11 +17,11 @@ add_custom_target(userconfig COMMAND ${CMAKE_COMMAND} configure_file( ${PROJECT_SOURCE_DIR}/cmake/templates/uninstall.cmake.in - ${PROJECT_BINARY_DIR}/uninstall.cmake + ${PROJECT_BINARY_DIR}/cmake/uninstall.cmake IMMEDIATE @ONLY) add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} - -P ${PROJECT_BINARY_DIR}/cuninstall.cmake) + -P ${PROJECT_BINARY_DIR}/cmake/uninstall.cmake) # }}} # Target: clang-format {{{ diff --git a/cmake/templates/userconfig.cmake.in b/cmake/templates/userconfig.cmake.in index 55106949..1dd573eb 100644 --- a/cmake/templates/userconfig.cmake.in +++ b/cmake/templates/userconfig.cmake.in @@ -2,6 +2,6 @@ set(USER_CONFIG_HOME $ENV{XDG_CONFIG_HOME}) if(NOT USER_CONFIG_HOME) set(USER_CONFIG_HOME $ENV{HOME}/.config) endif() -set(USER_CONFIG_HOME ${USER_CONFIG_HOME}/lemonbuddy) +set(USER_CONFIG_HOME ${USER_CONFIG_HOME}/polybar) file(INSTALL @CMAKE_SOURCE_DIR@/examples/config DESTINATION ${USER_CONFIG_HOME}) diff --git a/config b/config deleted file mode 100644 index f3d0bcd0..00000000 --- a/config +++ /dev/null @@ -1,379 +0,0 @@ -; -; this config is written for an unreleased version (lemonbuddy "2.0-beta" branch) -; it might need some tweaking to run on the latest released version... try for yourself -; - -[bar/top] -monitor = HDMI-1 -width = 100% -height = 27 -offset-x = 0 -offset-y = 0 - -background = #ee222222 -foreground = #ccfafafa -linecolor = #666 - -border-bottom = 2 -border-bottom-color = #333 - -spacing = 1 -lineheight = 1 - -padding-left = 0 -padding-right = 2 - -module-margin-left = 1 -module-margin-right = 2 - -font-0 = tamzen:size=9;1 -font-1 = unifont:size=6;-1 -font-2 = siji:pixelsize=10;0 - -modules-left = bspwm -modules-center = mpd -modules-right = volume memory cpu date - -tray-position = right - -wm-restack = bspwm - - -[bar/bottom] -monitor = HDMI-1 -bottom = true -width = 100% -height = ${bar/top.height} -offset-y = 0 - -background = ${bar/top.background} -foreground = ${bar/top.foreground} -linecolor = ${bar/top.linecolor} - -border-top = 2 -border-top-color = #333 - -spacing = ${bar/top.spacing} -lineheight = ${bar/top.lineheight} -padding-right = ${bar/top.padding-right} -module-margin-left = 0 -module-margin-right = ${bar/top.module-margin-right} - -font-0 = ${bar/top.font-0} -font-1 = ${bar/top.font-1} -font-2 = ${bar/top.font-2} - -modules-left = bspwm -modules-right = date powermenu - -wm-restack = ${bar/top.wm-restack} - - -[module/bspwm] -type = internal/bspwm -format = - -; ws-icon-0 = term; -; ws-icon-1 = web; -; ws-icon-2 = code; -; ws-icon-3 = music; -; ws-icon-4 = irssi; -; ws-icon-default =  -ws-icon-default = x - -label-active = o -label-active-background = #ee333333 -label-active-underline= #cc333333 -label-active-padding = 2 - -label-occupied = %{O-1}⏺%{O-1} -label-occupied-padding = 2 - -label-urgent = ! -label-urgent-background = #bd2c40 -label-urgent-padding = 2 - -label-empty = x -label-empty-foreground = #444 -label-empty-padding = 2 - -; label-monocle =  -; label-monocle-padding = 2 -; label-monocle-background = #171717 -; label-monocle-foreground = #e60053 - -; label-floating =  -; label-floating-padding = 2 -; label-floating-background = #171717 -; label-floating-foreground = #e60053 - - -[module/cpu] -type = internal/cpu -interval = 2 - -format =