diff --git a/.travis.yml b/.travis.yml index a8093d1bd1b145bf11b662c7140ab36f5cefb14f..ac35e407f4d40ff1347f5d1b894aa51b364399b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,9 @@ --- -matrix: - include: - - os: linux - dist: trusty - sudo: false - group: beta - language: python - python: 3.6 - install: - - pip install pre_commit | cat - - os: osx - language: generic - install: - - brew install shellcheck - - pip install pre_commit | cat +language: python +python: "3.6" +dist: trusty +sudo: false +group: beta cache: - pip - directories: @@ -26,10 +16,11 @@ addons: packages: - shellcheck +install: + - pip install pre_commit | cat + script: - pre-commit run --all-files - - cd; $TRAVIS_BUILD_DIR/install - - git bull notifications: email: false diff --git a/README.rst b/README.rst index 38c1084b0a7b499488f945de67cfe7b022183e89..56b144b271f60ef0330f6f097fe9081f9e4e8a87 100644 --- a/README.rst +++ b/README.rst @@ -17,8 +17,14 @@ WARNING: This will overwrite your existing files. .. code:: shell - git clone https://www.shore.co.il/git/rcfiles - rcfiles/install + cd + git clone https://www.shore.co.il/git/rcfiles .git + sed -i '/bare/d' .git/config + git reset --hard + git bull + cd .githooks + find -type f -exec ln -sf ../../.githooks/{} ../.git/hooks/ \; + cd ../ License ------- diff --git a/install b/install deleted file mode 100755 index af49d6bf3b805a3793205a211a146cae6d13102a..0000000000000000000000000000000000000000 --- a/install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -set -eu -case "$0" in - \.*) - git_root="$PWD/$(dirname "$0")";; - *) - git_root="$(dirname "$0")";; -esac -for file in $(git -C "$git_root" ls-files) -do - mkdir -p "$(dirname "$HOME/$file")" - mv -f "$git_root/$file" "$HOME/$file" -done -mv "$git_root/.git" "$HOME/" -cd -rm -r "$git_root" -find -name .git -type f -exec sed -i "s@$git_root@$HOME@g" {} \; -find -name config -type f -exec sed -i "s@$git_root@$HOME@g" {} \; -git submodule update --remote -cd .githooks -find -type f -exec ln -sf ../../.githooks/{} ../.git/hooks/ \; -cd ../