Commit e80a219e authored by nimrod's avatar nimrod
Browse files

Rework the setup process a bit. 

- Setup the Git submodules in the post-merge hook.
- Update documentation:
  - Remove the Git submodule setup since it's done in the post-merge
    hook.
  - Add download-password-db to the setup process so that all make
    targets succeed.
parent d9eb12c4

.githooks/post-merge

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ notify 'Loading dconf config' 
Documents/bin/dconf-load

notify 'Configuring Git repo'

git config --local status.showUntrackedFiles no

notify 'Setting up Git submodules'

git bull

if command -pv vagrant > /dev/null

then

	notify 'Installing Vagrant plugins'

README.md

+1 −2
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ git remote add origin https://git.shore.co.il/nimrod/rcfiles.git/ 
git fetch

git reset --hard origin/master

git branch --set-upstream-to=origin/master

git bull

Documents/bin/install-git-hooks

Documents/bin/download-password-db

.githooks/post-merge

```