Commit graph

16 commits

Author SHA1 Message Date
a-kenji
d6a49f683b
Merge pull request #433 from a-kenji/disable-default-config-test
Disable Default Config Test
2021-05-02 16:29:37 +02:00
a-kenji
c193a0571c Disable Default Config Test
For now, it fails if there is a local config, differing
from the default config.
2021-05-02 16:20:05 +02:00
a-kenji
993a6fdf0a Rename install -> setup
* Renaming of the install module to convey the intent more,
move functions that install to a submodule install of setup.
2021-05-02 15:59:02 +02:00
Yutaka Kamei
168deabea7
Load config before start()
Previously, a config file was loaded within `start()`, and if the config
file is invalid, Zellij was supposed to show a user what's wrong with
it. However, since `start()` starts setting up its terminal with an
alternative screen buffer, neither standard output nor standard error
could display such an error.

This change intends to address this issue by making Zellij load a config
file before `start()`.

In addition, the patch also includes some refactorings:

* Redefine `from_cli_config` with `TryFrom`, which was introduced in
  Rust 1.34
* Remove conditional declaration `cfg(not(test))` because `start()` now
  receive a `Config` as the third argument
* Introduce [`tempfile`](https://crates.io/crates/tempfile) in order to
  run tests with actual files
* Typo?: "Deserialisation" -> "Deserialization"
2021-05-02 06:18:40 +09:00
a-kenji
77e0b5e0d7 Config Loading
* Configuration is now handled in this order:
 --config flag
 ZELLIJ_CONFIG_FILE env
 get_default_config_dir() (directories-next)
 HOME/.config/zellij (for mac convenience)
 SYSTEM_DEFAULT_CONFIG_DIR (for distributions to specify sensible
 defaults ontop of zellij)
 from assets

* Fix default.yaml file

* Move default.yaml file to assets directory
2021-04-27 21:38:26 +02:00
a-kenji
ae010964ff Chore(Rustfmt) 2021-04-21 09:11:58 +02:00
a-kenji
2c12e8ff83 Change Config To Flag (#290)
This changes the `config` subcommand to a config flag.

Add option subcommand for now, for the clearing of default path.

Add `ZELLIJ_CONFIG` environment variable.

The configuration locations are now as follows:
    * `--config` flag
    * `ZELLIJ_CONFIG` environment variable
    * default config location
in that order.
2021-04-21 09:03:46 +02:00
Brooks J Rady
6f4dcfbf65 fix(clippy): get ci passing again 2021-04-13 18:14:13 +01:00
a-kenji
ca014d7aac Use Default Configuration for Tests
Uses the default configuration for tests,
in order to not mess up test cases with
different configurations in the config file.
2021-04-04 18:06:12 +02:00
a-kenji
a80d5f700b (Chore): rustfmt 2021-03-26 21:59:38 +01:00
a-kenji
98c4227c81 Fix tests 2021-03-26 21:59:20 +01:00
a-kenji
b30400ac47 Fix config default location
The default location is now correctly used again
2021-03-26 21:46:06 +01:00
a-kenji
91c109a902 Move test to /unit 2021-03-17 22:50:03 +01:00
a-kenji
e64192b42e Add a clean config option
Add a clean config option, which
makes zellij not look for a default
configuration file.
2021-03-17 16:56:02 +01:00
a-kenji
224c606b45 Remove logging to log.txt 2021-03-16 21:34:50 +01:00
a-kenji
a86d8c2161 Add example config file. 2021-03-12 22:05:41 +01:00
Renamed from src/common/config.rs (Browse further)