diff options
| author | Nicolas Hennion <nicolashennion@gmail.com> | 2024-01-06 09:58:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-06 09:58:11 +0100 |
| commit | 98f08f8511220c45310990dfbaef5fb0ecc72972 (patch) | |
| tree | 539d06c7cb5e356b4598acf40de6b6a50882e574 | |
| parent | ef06423ee42e50711765c83c3702bb88be133909 (diff) | |
| parent | d8d26e991b70e7612406c481bc8f1304340a5032 (diff) | |
Merge pull request #2641 from osalbahr/add-macos-home-config
macOS: default to `~/.config/glances`
| -rw-r--r-- | docs/config.rst | 2 | ||||
| -rw-r--r-- | docs/man/glances.1 | 2 | ||||
| -rw-r--r-- | glances/config.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/config.rst b/docs/config.rst index 4bc30ac2..738869a3 100644 --- a/docs/config.rst +++ b/docs/config.rst @@ -19,7 +19,7 @@ You can place your ``glances.conf`` file in the following locations: ==================== ============================================================= ``Linux``, ``SunOS`` ~/.config/glances/, /etc/glances/, /usr/share/docs/glances/ ``*BSD`` ~/.config/glances/, /usr/local/etc/glances/, /usr/share/docs/glances/ -``macOS`` ~/Library/Application Support/glances/, /usr/local/etc/glances/, /usr/share/docs/glances/ +``macOS`` ~/.config/glances/, ~/Library/Application Support/glances/, /usr/local/etc/glances/, /usr/share/docs/glances/ ``Windows`` %APPDATA%\\glances\\glances.conf ==================== ============================================================= diff --git a/docs/man/glances.1 b/docs/man/glances.1 index 7af0053e..59a8c970 100644 --- a/docs/man/glances.1 +++ b/docs/man/glances.1 @@ -576,7 +576,7 @@ _ T{ \fBmacOS\fP T} T{ -~/Library/Application Support/glances/, /usr/local/etc/glances/, /usr/share/docs/glances/ +~/.config/glances/, ~/Library/Application Support/glances/, /usr/local/etc/glances/, /usr/share/docs/glances/ T} _ T{ diff --git a/glances/config.py b/glances/config.py index 7138e48c..b5a5a90c 100644 --- a/glances/config.py +++ b/glances/config.py @@ -127,7 +127,7 @@ class Config(object): * custom path: /path/to/glances * Linux, SunOS: ~/.config/glances, /etc/glances * *BSD: ~/.config/glances, /usr/local/etc/glances - * macOS: ~/Library/Application Support/glances, /usr/local/etc/glances + * macOS: ~/.config/glances, ~/Library/Application Support/glances, /usr/local/etc/glances * Windows: %APPDATA%\glances The config file will be searched in the following order of priority: |