Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,8 @@ notify 'Loading dconf config' ...@@ -12,6 +12,8 @@ notify 'Loading dconf config'
Documents/bin/dconf-load Documents/bin/dconf-load
notify 'Configuring Git repo' notify 'Configuring Git repo'
git config --local status.showUntrackedFiles no git config --local status.showUntrackedFiles no
notify 'Setting up Git submodules'
git bull
if command -pv vagrant > /dev/null if command -pv vagrant > /dev/null
then then
notify 'Installing Vagrant plugins' notify 'Installing Vagrant plugins'
......
...@@ -20,8 +20,7 @@ git remote add origin https://git.shore.co.il/nimrod/rcfiles.git/ ...@@ -20,8 +20,7 @@ git remote add origin https://git.shore.co.il/nimrod/rcfiles.git/
git fetch git fetch
git reset --hard origin/master git reset --hard origin/master
git branch --set-upstream-to=origin/master git branch --set-upstream-to=origin/master
git bull Documents/bin/download-password-db
Documents/bin/install-git-hooks
.githooks/post-merge .githooks/post-merge
``` ```
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment