From 8c72cc4e34f7898b66d895f0e2085685208794c6 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 5 May 2017 19:35:55 +0300
Subject: [PATCH] - Removed install script, found a much simpler way to
install. Updated README accordingly. - Reverted OSX TravisCi test since the
only test is using pre-commit now.
---
.travis.yml | 25 ++++++++-----------------
README.rst | 10 ++++++++--
install | 22 ----------------------
3 files changed, 16 insertions(+), 41 deletions(-)
delete mode 100755 install
diff --git a/.travis.yml b/.travis.yml
index a8093d1..ac35e40 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 38c1084..56b144b 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 af49d6b..0000000
--- 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 ../
--
GitLab