From 859038e58f3b9d9a41c3cd45906bec56aedf65b0 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Thu, 17 Dec 2020 01:42:16 +0200 Subject: [PATCH 1/2] Allow trailing spaces in md/rst files --- .editorconfig | 2 +- .gitattributes | 4 ++++ .pre-commit-config.yaml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 3997f583..e1baa432 100755 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[*.md] +[*.{md,rst}] trim_trailing_whitespace = false [.git*] diff --git a/.gitattributes b/.gitattributes index bb7d1461..de622e06 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,9 @@ *.sh text eol=lf *.bash text eol=lf +# Docs allow trailing whitespaces +*.md whitespace=-blank-at-eol +*.rst whitespace=-blank-at-eol + # Windows files *.bat text eol=crlf diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 84ed6ee7..caed0df9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,6 +9,7 @@ repos: rev: v2.3.0 hooks: - id: trailing-whitespace + exclude: ".(md|rst)$" - id: end-of-file-fixer - id: check-merge-conflict - id: mixed-line-ending From 181863af1d359e5f7484300ce7f9c3729ecc0986 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Wed, 16 Dec 2020 20:36:48 +0200 Subject: [PATCH 2/2] docs: Add simple installation instructions to readme This will help newcomers, and not confuse them by redirecting them to another site instantly. --- docs/README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 381af07e..23b765a7 100644 --- a/docs/README.md +++ b/docs/README.md @@ -14,7 +14,7 @@ Stop polluting your `~/bin` directory and your `.bashrc` file, fork/clone Bash-i - [Main Page](https://bash-it.readthedocs.io/en/latest) - [Contributing](#contributing) -- [Installation](https://bash-it.readthedocs.io/en/latest/installation) +- [Installation](#installation) - [Install Options](https://bash-it.readthedocs.io/en/latest/installation/#install-options) - [via Docker](https://bash-it.readthedocs.io/en/latest/installation/#install-using-docker) - [Updating](https://bash-it.readthedocs.io/en/latest/installation/#updating) @@ -33,6 +33,17 @@ Stop polluting your `~/bin` directory and your `.bashrc` file, fork/clone Bash-i - [Help Out](https://bash-it.readthedocs.io/en/latest/#help-out) - [Contributors](#contributors) +## Installation + +1) Check out a clone of this repo to a location of your choice, such as + ``git clone --depth=1 https://github.com/Bash-it/bash-it.git ~/.bash_it`` +2) Run ``~/.bash_it/install.sh`` + +Thats it! :smiley: +You can check out more components of Bash-it, and customize it to your desire. +For more information, see detailed instructions [here](https://bash-it.readthedocs.io/en/latest/installation/). + + ## Contributing Please take a look at the [Contribution Guidelines](https://bash-it.readthedocs.io/en/latest/contributing) before reporting a bug or providing a new feature.