diff options
| author | Martin Tournoij <martin@arp242.net> | 2020-06-03 11:24:41 +0800 |
|---|---|---|
| committer | Martin Tournoij <martin@arp242.net> | 2020-06-03 12:33:45 +0800 |
| commit | 76efcab2f936fe375ad1106cd56c16a70137553d (patch) | |
| tree | 26f8b4ddb7594652c3863ac37f372fe484f2a8c6 /src/_pgsql_utils | |
| parent | Merge pull request #747 from okuramasafumi/nanoc-completion (diff) | |
| download | zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.tar zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.tar.gz zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.tar.bz2 zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.tar.lz zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.tar.xz zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.tar.zst zsh-completions-76efcab2f936fe375ad1106cd56c16a70137553d.zip | |
pgsql: Check for pg_config existence
pg_config isn't installed by default on many systems, and is usually
part of postgresql-libs-devel or some such, leading to needless
"pg_config not found" errors on completion.
Diffstat (limited to 'src/_pgsql_utils')
| -rw-r--r-- | src/_pgsql_utils | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/_pgsql_utils b/src/_pgsql_utils index dff7743..cbe2b8e 100644 --- a/src/_pgsql_utils +++ b/src/_pgsql_utils @@ -147,10 +147,9 @@ _pgsql_databases () { _pgsql_get_identity local _pgsql_services _pgsql_service_files - _pgsql_service_files=( - ~/.pg_service.conf - $(pg_config --sysconfdir)/pg_service.conf - ) + _pgsql_service_files=(~/.pg_service.conf) + (( $+commands[pg_config] )) && _pgsql_service_files+=$(pg_config --sysconfdir)/pg_service.conf + _pgsql_services=$( grep -h '^\[.*\]' $_pgsql_service_files 2>/dev/null \ | sed -e 's/^\[/service=/' -e 's/\].*$//' ) |