Merge lp:~bcicen/conky-manager/conky-manager into lp:conky-manager

Proposed by bcicen
Status: Needs review
Proposed branch: lp:~bcicen/conky-manager/conky-manager
Merge into: lp:conky-manager
Diff against target: 11 lines (+1/-1)
1 file modified
src/Main.vala (+1/-1)
To merge this branch: bzr merge lp:~bcicen/conky-manager/conky-manager
Reviewer Review Type Date Requested Status
Tony George Pending
Review via email:

Description of the change

Allow for symlinked conkyrc files in standard search paths via dereference recursive(-R) option for grep.

To post a comment you must log in.

Unmerged revisions

137. By bcicen

Allow for symbolically linked conkyrc files in search paths

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Main.vala'
2--- src/Main.vala 2015-10-21 13:01:40 +0000
3+++ src/Main.vala 2016-04-12 19:49:34 +0000
4@@ -430,7 +430,7 @@
5 public void find_conkyrc_files_in_path(string path){
6 string std_out = "";
7 string std_err = "";
8- string cmd = "grep -r \"^[[:blank:]]*TEXT[[:blank:]]*$\" \"%s\"".printf(path);
9+ string cmd = "grep -R \"^[[:blank:]]*TEXT[[:blank:]]*$\" \"%s\"".printf(path);
10 last_cmd = cmd;
11 int exit_code = execute_command_script_sync(cmd, out std_out, out std_err);


People subscribed via source and target branches

to all changes: