From e80a219eeab2e882ba121fe676b5c3edb694332b Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 29 Aug 2021 10:49:34 +0300
Subject: [PATCH] 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.
---
.githooks/post-merge | 2 ++
README.md | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.githooks/post-merge b/.githooks/post-merge
index c162463..0f3a001 100755
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -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'
diff --git a/README.md b/README.md
index 7d8116d..785d3b0 100644
--- a/README.md
+++ b/README.md
@@ -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
```
--
GitLab