1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Commit Graph

3452 Commits

Author SHA1 Message Date
Brenden Matthews
d0f1bfb1e6 Use flock with FreeBSD pkg install. 2019-03-08 17:51:02 -05:00
senjan
d295fe4393 idtype enum breaks Solaris conky 2019-03-08 08:17:55 -05:00
Brenden Matthews
8cd23712f2 Add Quickstart section to README. 2019-03-07 07:13:47 -06:00
Brenden Matthews
1481912a2a CI: Fix before_script for jobs that overload it. 2019-03-05 09:36:44 -05:00
Brenden Matthews
27f1e0fdac Reorganize, adjust wording. 2019-03-04 11:14:07 -05:00
Brenden Matthews
18d1a06dd3 Add more contributing notes. 2019-03-04 11:14:07 -05:00
Brenden Matthews
7ee8a0d6ef Move contributing section to CONTRIBUTING.md. 2019-03-04 11:14:07 -05:00
Brenden Matthews
1d409379ab Update README with contribution notes. 2019-03-04 11:14:07 -05:00
Kushagra Sinha
c352069b31 Add support for nested |exec| expressions
Nested exec expressions like ${execp echo '${execp echo hi}'} are not
evaluated correctly because parsing expressions like these generates and
registers new callbacks but we never wait for these callbacks to
complete before returning the result of the evaluation.

Fix this by re-evaluating expressions after running all pending
callbacks.
2019-03-03 13:24:23 -05:00
Kushagra Sinha
4cb79fb3e1 Revert "exec.cc: Cache the result to another variable and return it when we have a empty/invalid value. (#646)"
This reverts commit a644600bc5.
2019-03-03 13:24:23 -05:00
Kushagra Sinha
5defb96024 Add Google LLC to AUTHORS 2019-03-03 13:24:23 -05:00
Brenden Matthews
b3b3671278
Increase delay for FreeBSD pkg install. 2019-03-02 21:47:17 -05:00
Brenden Matthews
7def9736ab
Add note on GPL licensing. 2019-03-02 21:36:21 -05:00
Brenden Matthews
1b411b50e3
Conky is GPLv3, not BSD. 2019-03-02 21:34:53 -05:00
Brenden Matthews
4b9e51635a Remove sonarcloud from Travis build.
SonarCloud w/ Travis has become busted; removing from build.
2019-02-26 08:10:52 -05:00
Monsterovich
fc250d8047 fix spaces 2019-02-25 17:11:14 -05:00
Monsterovich
af99a203f8 Added docs 2019-02-25 17:11:14 -05:00
Monsterovich
3893146995 Added option to disable redraw on desktop change 2019-02-25 17:11:14 -05:00
lasers
3ee6b4fda4 make changes to default theme 2019-02-25 15:14:07 -06:00
Brenden Matthews
ddce0580c2
Apply d0d8930c5d for base image too, derp. 2019-02-25 16:10:51 -05:00
Brenden Matthews
d0d8930c5d Only push images if dockerfiles changed. 2019-02-25 16:06:16 -05:00
Brenden Matthews
c5adfcd7e6 FreeBSD build: increase lock delay for pkg install. 2019-02-25 15:24:03 -05:00
Brenden Matthews
520827bc8a Fix docker image cache handling. 2019-02-25 13:40:05 -05:00
Brenden Matthews
483105ee35
Remove sonarcloud, add GitLab badges.
Out with the old, in with the new.
2019-02-25 13:28:56 -05:00
Brenden Matthews
40a438be3e FreeBSD fixes, GitLab CI build improvements.
- use sccache for build caching
 - add coverage reports as build artifacts
 - add lcov-summary for coverage summary
 - clean up/refactor CI yaml

This resolves the FreeBSD part of #754.
2019-02-25 11:22:19 -05:00
Brenden Matthews
7b89d84f42 Enable tests on travis build. 2019-02-25 01:14:16 -05:00
Brenden Matthews
ef003a6491 Move key decryption to before_deploy. 2019-02-24 13:15:48 -05:00
Brenden Matthews
08f7cf0605 Refactor gitlab CI. 2019-02-24 12:33:34 -05:00
Brenden Matthews
f29da158cc
Add retry to gitlab jobs. 2019-02-24 09:55:30 -05:00
Brenden Matthews
dc35a1b0a8 Add more build envs to GitLab CI.
Adding:

 - clang-8
 - gcc-5 through gcc-8
 - fedora & centos builds

Fixing:
 - mysqlclient default search path
 - build on centos6
2019-02-24 09:46:45 -05:00
Brenden Matthews
46abd3b75a Apply fixes from clang-tidy/format. 2019-02-23 17:13:19 -05:00
Brenden Matthews
90673cf161 Make GitLab build work with clang checks. 2019-02-23 17:13:19 -05:00
Brenden Matthews
0ea4559f30
Set clang CC/CXX env vars in gitlab build. 2019-02-22 22:03:05 -05:00
Brenden Matthews
7b60d77538
Fix gitlab syntax. 2019-02-22 21:57:58 -05:00
Brenden Matthews
ed1d6eb8fd
Add gitlab CI. 2019-02-22 21:57:10 -05:00
Brenden Matthews
b3db652f4b
Add builder dockerfile. 2019-02-22 21:51:48 -05:00
Brenden Matthews
bc29814fec
Bump version. 2019-02-22 21:51:32 -05:00
Brenden Matthews
89316a620f
Use appimagetool to generate final appimage. 2019-02-22 21:12:15 -05:00
Brenden Matthews
79383ab7fa
Specify appimage signing key ID. 2019-02-22 20:58:17 -05:00
Brenden Matthews
9d5bc64c23
Fix key import command. 2019-02-22 20:55:45 -05:00
Brenden Matthews
e13bd4a1fd
Revert "Don't bother cleaning up temp dir on appimage build."
This reverts commit 96cdd3b5d5.
2019-02-22 20:45:05 -05:00
Brenden Matthews
96cdd3b5d5
Don't bother cleaning up temp dir on appimage build. 2019-02-22 20:25:07 -05:00
Brenden Matthews
4ae019386b
Derp, fix it for real. 2019-02-22 19:39:21 -05:00
Brenden Matthews
1a932bd736
Actually fix appimage signing. 2019-02-22 19:24:30 -05:00
Brenden Matthews
31a0096879
Fix key signing path. 2019-02-22 19:05:27 -05:00
Brenden Matthews
c9c6126df8
App public key for signing appimage. 2019-02-22 18:46:03 -05:00
Brenden Matthews
2e029e8720 Add appimage signing key. 2019-02-22 18:43:00 -05:00
Brenden Matthews
25acfe51cc Refactor Dockerfile. 2019-02-21 09:21:22 -05:00
Qu Wenruo
14e3b80c45 conky: Allow hwmon command to accept hwmon device name
[PROBLEM]
Some hwmon device number may change due to module load sequence.
E.g:
One boot would cause the following layout:
hwmon0->acpitz
hwmon1->pch_skylake
hwmon2->thinkpad
hwmon3->coretemp
hwmon4->iwlwifi

While another boot could lead to:
hwmon0->acpitz
hwmon1->pch_skylake
hwmon2->coretemp
hwmon3->thinkpad
hwmon4->iwlwifi

[ENHANCEMENT]
This patch will enhance the hwmon command to accept hwmon device name as
first parameter instead of number.

Now "hwmon 3 temp 1" can be converted to "hwmon coretemp temp 1", which
is more readable and user won't ever need to bother the hwmon sequence
number change.

Signed-off-by: Qu Wenruo <wqu@suse.com>
2019-02-17 09:24:15 -05:00
Brenden Matthews
846c25b28b
Include versioned tags in builds. 2019-01-24 12:50:19 -05:00