betorobson · January 10, 2022 13:13 · Oct 18, 2017 · Oct 18, 2017 · Oct 18, 2017 · Feb 21, 2017
diff --git a/readme.md b/readme.md
@@ -4,15 +4,15 @@
 ```bash
 $ mkdir hooks && curl -o hooks/post-merge -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-merge && curl -o hooks/post-checkout -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-checkout
 ```
-###2. Add a script install at your package.json
+### 2. Add a script install at your package.json
 ```json
 ...
   "scripts": {                                                       
     "install": "cp ./hooks/* .git/hooks/ && chmod -R a+X .git/hooks/"
   },                                                                 
 ...
 ```
-###3. Commit and push to remote repository
+### 3. Commit and push to remote repository
 #### At this point your team will get any change on package.json and bower.json files
 
 #### Thanks to these two guys:

diff --git a/readme.md b/readme.md
@@ -1,6 +1,6 @@
 # Git hooks for NPM and Bower Projects
 
-##1. Copy theses files into your hooks folder
+## 1. Copy theses files into your hooks folder
 ```bash
 $ mkdir hooks && curl -o hooks/post-merge -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-merge && curl -o hooks/post-checkout -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-checkout
 ```

diff --git a/post-checkout b/post-checkout
@@ -9,3 +9,5 @@ check_run() {
 
 check_run package.json "npm prune && npm install"
 check_run bower.json "bower prune && bower install"
+
+exit 0;
diff --git a/post-merge b/post-merge
@@ -9,4 +9,6 @@ check_run() {
 }
 
 check_run package.json "npm prune && npm install"
-check_run bower.json "bower prune && bower install"
+check_run bower.json "bower prune && bower install"
+
+exit 0;
diff --git a/readme.md b/readme.md
@@ -12,8 +12,8 @@ $ mkdir hooks && curl -o hooks/post-merge -O https://gist.github.com/
   },                                                                 
 ...
 ```
-
-### At this point your team will get any change on package.json and bower.json files
+###3. Commit and push to remote repository
+#### At this point your team will get any change on package.json and bower.json files
 
 #### Thanks to these two guys:
 - https://gist.github.com/sindresorhus/7996717

diff --git a/readme.md b/readme.md
@@ -1,14 +1,10 @@
 # Git hooks for NPM and Bower Projects
 
-##1. Create a hooks folder
+##1. Copy theses files into your hooks folder
 ```bash
-$ mkdir hooks
+$ mkdir hooks && curl -o hooks/post-merge -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-merge && curl -o hooks/post-checkout -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-checkout
 ```
-##2. Copy theses files into your hooks folder
-```bash
-$ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-merge && chmod +x post-merge && mv post-merge hooks/ && curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-checkout && chmod +x post-checkout && mv post-checkout hooks/
-```
-###3. Add a script install at your package.json
+###2. Add a script install at your package.json
 ```json
 ...
   "scripts": {                                                       

diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@ $ mkdir hooks
 ```
 ##2. Copy theses files into your hooks folder
 ```bash
-$ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/post-merge && chmod +x post-merge && mv post-merge hooks/ && curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/post-checkout && chmod +x post-checkout && mv post-checkout hooks/
+$ curl -O https://gist.githubusercontent.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-merge && chmod +x post-merge && mv post-merge hooks/ && curl -O https://gist.githubusercontent.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/raw/e02ee803af1094a0dbff6c47febe02e1f5cb33b8/post-checkout && chmod +x post-checkout && mv post-checkout hooks/
 ```
 ###3. Add a script install at your package.json
 ```json

diff --git a/readme.md b/readme.md
@@ -17,7 +17,7 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
 ...
 ```
 
-### At this point your team will get any change at package.json and bower.json files
+### At this point your team will get any change on package.json and bower.json files
 
 #### Thanks to these two guys:
 - https://gist.github.com/sindresorhus/7996717

diff --git a/readme.md b/readme.md
@@ -17,7 +17,7 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
 ...
 ```
 
-### At this point your team will get any changes at package.json and bower.json files
+### At this point your team will get any change at package.json and bower.json files
 
 #### Thanks to these two guys:
 - https://gist.github.com/sindresorhus/7996717

diff --git a/readme.md b/readme.md
@@ -20,5 +20,5 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
 ### At this point your team will get any changes at package.json and bower.json files
 
 #### Thanks to these two guys:
-https://gist.github.com/sindresorhus/7996717
-https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f
+- https://gist.github.com/sindresorhus/7996717
+- https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f
diff --git a/readme.md b/readme.md
@@ -19,6 +19,6 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
 
 ### At this point your team will get any changes at package.json and bower.json files
 
-Thanks to these two guys:
+#### Thanks to these two guys:
 https://gist.github.com/sindresorhus/7996717
 https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f
diff --git a/readme.md b/readme.md
@@ -20,5 +20,5 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
 ### At this point your team will get any changes at package.json and bower.json files
 
 Thanks to these two guys:
-(https://gist.github.com/sindresorhus/7996717)
-(https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f)
+https://gist.github.com/sindresorhus/7996717
+https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f
diff --git a/readme.md b/readme.md
@@ -17,4 +17,8 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
 ...
 ```
 
-### At this point your team will get any changes at package.json and bower.json files
+### At this point your team will get any changes at package.json and bower.json files
+
+Thanks to these two guys:
+(https://gist.github.com/sindresorhus/7996717)
+(https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f)
diff --git a/post-checkout b/post-checkout
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
+# fork from https://gist.github.com/jakemhiller/d342ad51505addf78ec628a16fd3280f
 
 changed_files="$(git diff-tree -r --name-only --no-commit-id $1 $2)"
 
 check_run() {
-        echo "$changed_files" | grep --quiet "$1" && eval "$2"
+	echo "$changed_files" | grep --quiet "$1" && eval "$2"
 }
 
 check_run package.json "npm prune && npm install"
-check_run bower.json "bower prune && bower install"
+check_run bower.json "bower prune && bower install"
diff --git a/post-merge b/post-merge
@@ -1,19 +1,12 @@
 #!/usr/bin/env bash
 # MIT © Sindre Sorhus - sindresorhus.com
-
-# git hook to run a command after `git pull` if a specified file was changed
-# Run `chmod +x post-merge` to make it executable then put it into `.git/hooks/`.
+# fork from https://gist.github.com/sindresorhus/7996717
 
 changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
 
 check_run() {
 	echo "$changed_files" | grep --quiet "$1" && eval "$2"
 }
 
-# Example usage
-
-# In this example it's used to run `npm install` if package.json changed
 check_run package.json "npm prune && npm install"
-
-# In this example it's used to run `bower install` if bower.json changed
-check_run bower.json "bower prune && bower install"
+check_run bower.json "bower prune && bower install"
diff --git a/readme.md b/readme.md
@@ -15,4 +15,6 @@ $ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/po
     "install": "cp ./hooks/* .git/hooks/ && chmod -R a+X .git/hooks/"
   },                                                                 
 ...
-```
+```
+
+### At this point your team will get any changes at package.json and bower.json files
diff --git a/post-checkout b/post-checkout
@@ -1,36 +1,10 @@
-#!/bin/bash
-# Does not run if your local branch is behind the remote.
-# https://gist.github.com/stefansundin/82051ad2c8565999b914
+#!/usr/bin/env bash
 
-# Exit early if this was only a file checkout, not a branch change ($3 == 1)
-[[ $3 == 0 ]] && exit 0
+changed_files="$(git diff-tree -r --name-only --no-commit-id $1 $2)"
 
-oldRef=$1
-newRef=$2
-
-# Exit early if the local branch is behind the remote
-LOCAL=$(git rev-parse @)
-REMOTE=$(git rev-parse @{u} 2> /dev/null)
-BASE=$(git merge-base @ @{u} 2> /dev/null)
-
-if [[ "$LOCAL" != "$REMOTE" && "$LOCAL" = "$BASE" ]]; then
-  echo "You are behind origin, not running bundle/migrate post-checkout hook."
-  exit 1
-fi
-
-
-function changed {
-  git diff --name-only $oldRef $newRef | grep "^$1" > /dev/null 2>&1
+check_run() {
+        echo "$changed_files" | grep --quiet "$1" && eval "$2"
 }
 
-if changed 'bower.json'; then
-  echo "bower.json changed, installing"
-  bower prune
-  bower install
-fi
-
-if changed 'package.json'; then
-  echo "Package.json changed, installing"
-  npm prune
-  npm install
-fi
+check_run package.json "npm prune && npm install"
+check_run bower.json "bower prune && bower install"
diff --git a/post-checkout b/post-checkout
@@ -0,0 +1,36 @@
+#!/bin/bash
+# Does not run if your local branch is behind the remote.
+# https://gist.github.com/stefansundin/82051ad2c8565999b914
+
+# Exit early if this was only a file checkout, not a branch change ($3 == 1)
+[[ $3 == 0 ]] && exit 0
+
+oldRef=$1
+newRef=$2
+
+# Exit early if the local branch is behind the remote
+LOCAL=$(git rev-parse @)
+REMOTE=$(git rev-parse @{u} 2> /dev/null)
+BASE=$(git merge-base @ @{u} 2> /dev/null)
+
+if [[ "$LOCAL" != "$REMOTE" && "$LOCAL" = "$BASE" ]]; then
+  echo "You are behind origin, not running bundle/migrate post-checkout hook."
+  exit 1
+fi
+
+
+function changed {
+  git diff --name-only $oldRef $newRef | grep "^$1" > /dev/null 2>&1
+}
+
+if changed 'bower.json'; then
+  echo "bower.json changed, installing"
+  bower prune
+  bower install
+fi
+
+if changed 'package.json'; then
+  echo "Package.json changed, installing"
+  npm prune
+  npm install
+fi
diff --git a/post-merge b/post-merge
@@ -11,5 +11,9 @@ check_run() {
 }
 
 # Example usage
+
 # In this example it's used to run `npm install` if package.json changed
-check_run package.json "npm install"
+check_run package.json "npm prune && npm install"
+
+# In this example it's used to run `bower install` if bower.json changed
+check_run bower.json "bower prune && bower install"
diff --git a/readme.md b/readme.md
@@ -3,4 +3,16 @@
 ##1. Create a hooks folder
 ```bash
 $ mkdir hooks
+```
+##2. Copy theses files into your hooks folder
+```bash
+$ curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/post-merge && chmod +x post-merge && mv post-merge hooks/ && curl -O https://gist.github.com/betorobson/23e5914b51e844bac5eaa6032d6f3f88/post-checkout && chmod +x post-checkout && mv post-checkout hooks/
+```
+###3. Add a script install at your package.json
+```json
+...
+  "scripts": {                                                       
+    "install": "cp ./hooks/* .git/hooks/ && chmod -R a+X .git/hooks/"
+  },                                                                 
+...
 ```
diff --git a/readme.md b/readme.md
@@ -1 +1,6 @@
 # Git hooks for NPM and Bower Projects
+
+##1. Create a hooks folder
+```bash
+$ mkdir hooks
+```
diff --git a/readme.md b/readme.md
@@ -0,0 +1 @@
+# Git hooks for NPM and Bower Projects
diff --git a/post-mergea → post-merge b/post-mergea → post-merge
diff --git a/post-merge → post-mergea b/post-merge → post-mergea
diff --git a/post-merge b/post-merge
@@ -1,4 +1,4 @@
-#/usr/bin/env bash
+#!/usr/bin/env bash
 # MIT © Sindre Sorhus - sindresorhus.com
 
 # git hook to run a command after `git pull` if a specified file was changed
@@ -11,6 +11,5 @@ check_run() {
 }
 
 # Example usage
-# In this example it's used to run `npm install` if package.json changed and `bower install` if `bower.json` changed.
+# In this example it's used to run `npm install` if package.json changed
 check_run package.json "npm install"
-check_run bower.json "bower install"
diff --git a/post-merge b/post-merge
@@ -0,0 +1,16 @@
+#/usr/bin/env bash
+# MIT © Sindre Sorhus - sindresorhus.com
+
+# git hook to run a command after `git pull` if a specified file was changed
+# Run `chmod +x post-merge` to make it executable then put it into `.git/hooks/`.
+
+changed_files="$(git diff-tree -r --name-only --no-commit-id ORIG_HEAD HEAD)"
+
+check_run() {
+	echo "$changed_files" | grep --quiet "$1" && eval "$2"
+}
+
+# Example usage
+# In this example it's used to run `npm install` if package.json changed and `bower install` if `bower.json` changed.
+check_run package.json "npm install"
+check_run bower.json "bower install"
No results found