diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-02-26 17:56:42 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-02-26 22:41:16 +0100 |
| commit | 55ef51eb521f8dae64955dedd50dccf63aa1b11a (patch) | |
| tree | 2289345bb822daeaf90175a8608d80f691c76f58 /misc | |
| parent | fe8088478374eec1fe4d0c80e9577bb915b453d2 (diff) | |
| download | clufter-55ef51eb521f8dae64955dedd50dccf63aa1b11a.tar.gz clufter-55ef51eb521f8dae64955dedd50dccf63aa1b11a.tar.xz clufter-55ef51eb521f8dae64955dedd50dccf63aa1b11a.zip | |
clufter.spec: modify the "actual" bash completion file
Reported by Mamoru Tasaka:
<https://bugzilla.redhat.com/show_bug.cgi?id=1180723#c23>
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/clufter.spec | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/misc/clufter.spec b/misc/clufter.spec index a0041a1..a580999 100644 --- a/misc/clufter.spec +++ b/misc/clufter.spec @@ -51,6 +51,8 @@ %{!?clufter_bashcompdir:%global clufter_bashcompdir %{_datadir}/bash-completion/completions} %if %{with bashcomplink} %{!?clufter_bashcompreal:%global clufter_bashcompreal %{_sysconfdir}/%{name}/bash-completion} + %else + %undefine clufter_bashcompreal %endif %endif %if %{with manpage} @@ -278,8 +280,9 @@ ret=$? %if %{with bashcomp} %post %{pkgsimple %{clufter_cli}} if [ $1 -gt 1 ]; then # no gain regenerating it w/ fresh install (same result) -declare bashcomp="$(pkg-config --variable=completionsdir bash-completion \ - 2>/dev/null || echo '%{clufter_bashcompdir}')/%{name}" +declare bashcomp="%{?clufter_bashcompreal}%{?!clufter_bashcompreal:$( + pkg-config --variable=completionsdir bash-completion 2>/dev/null \ + || echo '%{clufter_bashcompdir}')/%{name}}" %{clufter_script} --completion-bash > "${bashcomp}" 2>/dev/null || : fi %endif @@ -287,8 +290,9 @@ fi %global clufter_post_ext %( cat <<EOF -declare bashcomp="\\$(pkg-config --variable=completionsdir bash-completion \\\\ - 2>/dev/null || echo '%{clufter_bashcompdir}')/%{name}" +declare bashcomp="%{?clufter_bashcompreal}%{?!clufter_bashcompreal:\\$( + pkg-config --variable=completionsdir bash-completion 2>/dev/null \\\\ + || echo '%{clufter_bashcompdir}')/%{name}}" # if the completion file is not present, suppose it is not desired test -x '%{clufter_script}' && test -f "\\${bashcomp}" \\\\ && %{clufter_script} --completion-bash > "\\${bashcomp}" 2>/dev/null || : |