updates for version 1.7

Author: learnbyexample

README.md

@@ -21,10 +21,10 @@ You can purchase the book using these links:
 * https://gumroad.com/l/gnugrep_ripgrep
 * https://leanpub.com/gnugrep_ripgrep
 * You can also get the book as part of **Magical one-liners** bundle from https://gumroad.com/l/oneliners or https://leanpub.com/b/oneliners
-* You can also get the book as part of **Awesome Regex** bundle from https://leanpub.com/b/regex or https://gumroad.com/l/regex
+* You can also get the book as part of **Awesome Regex** bundle from https://gumroad.com/l/regex or https://leanpub.com/b/regex
 * See https://learnbyexample.github.io/books/ for list of other books
 
-For a preview of the book, see [sample chapters](https://github.com/learnbyexample/learn_gnugrep_ripgrep/blob/master/sample_chapters/grep_sample_chapters.pdf)
+For a preview of the book, see [sample chapters](https://github.com/learnbyexample/learn_gnugrep_ripgrep/blob/master/sample_chapters/gnu_grep_sample.pdf)
 
 The book can also be [viewed as a single markdown file in this repo](./gnu_grep.md). See my blogpost on [generating pdf from markdown using pandoc](https://learnbyexample.github.io/tutorial/ebook-generation/customizing-pandoc/) if you are interested in the ebook creation process.
 
@@ -34,11 +34,11 @@ For web version of the book, visit https://learnbyexample.github.io/learn_gnugre
 
 # Feedback
 
-Please open an issue if you spot any typo/errors.
+[Open an issue](https://github.com/learnbyexample/learn_gnugrep_ripgrep/issues) if you spot any typo/errors.
 
-I'd also highly appreciate your feedback about the book.
+:warning: :warning: Please DO NOT submit pull requests. Main reason being any modification requires changes in multiple places.
 
-Goodreads: https://www.goodreads.com/book/show/47406700-gnu-grep-and-ripgrep
+I'd also highly appreciate your feedback about the book.
 
 Twitter: https://twitter.com/learn_byexample
 
@@ -65,10 +65,11 @@ Twitter: https://twitter.com/learn_byexample
 * [GNU grep documentation](https://www.gnu.org/software/grep/manual/grep.html) — manual and examples
 * [ripgrep](https://github.com/BurntSushi/ripgrep) — user guide and examples
 * [stackoverflow](https://stackoverflow.com/) and [unix.stackexchange](https://unix.stackexchange.com/) — for getting answers to pertinent questions on `bash`, `grep` and other commands
-* [tex.stackexchange](https://tex.stackexchange.com/) — for help on `pandoc` and `tex` related questions
+* [tex.stackexchange](https://tex.stackexchange.com/) — for help on [pandoc](https://github.com/jgm/pandoc/) and `tex` related questions
 * Cover image
     * [LibreOffice Draw](https://www.libreoffice.org/discover/draw/)
     * [detective](https://www.flickr.com/photos/32068925@N08/3028314931) by [olarte.ollie](https://www.flickr.com/photos/ollieolarte/) under [Creative Commons Attribution-Share Alike 2.0 Generic](https://creativecommons.org/licenses/by-sa/2.0/)
+* [pngquant](https://pngquant.org/) and [svgcleaner](https://github.com/RazrFalcon/svgcleaner) for optimizing images
 * [softwareengineering.stackexchange](https://softwareengineering.stackexchange.com/questions/39/whats-your-favourite-quote-about-programming) and [skolakoda](https://skolakoda.org/programming-quotes) for programming quotes
 * [Warning](https://commons.wikimedia.org/wiki/File:Warning_icon.svg) and [Info](https://commons.wikimedia.org/wiki/File:Info_icon_002.svg) icons by [Amada44](https://commons.wikimedia.org/wiki/User:Amada44) under public domain
 * [Andrew Gallant](https://blog.burntsushi.net/about/) (author of `ripgrep`) and [mikeblas](https://www.reddit.com/user/mikeblas) for critical feedback
@@ -85,3 +86,4 @@ Special thanks to all my friends and online acquaintances for their help, suppor
 The book is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 
 The code snippets are licensed under MIT, see [LICENSE](./LICENSE) file
+

Version_changes.md

@@ -1,5 +1,16 @@
 <br>
 
+### 1.7
+
+* Command versions updated to **GNU grep 3.6** and **ripgrep 12.1.1**
+* Added examples for using `--include` and `--exclude` when recursive option is not active
+* Added examples which require `**` in the `glob` pattern with `rg -g`
+* Updated documentation snippets as per new `man` and `info` pages
+* Updated timing data for speed comparison examples
+* Corrected various typos, improved descriptions/comments/examples/exercises/etc
+
+<br>
+
 ### 1.6
 
 * Clarified BRE vs ERE difference for line anchor escaping

code_snippets/Frequently_used_options.sh

@@ -70,7 +70,7 @@ grep -f search_strings.txt -e 'twice' programming_quotes.txt
 
 grep 'in' programming_quotes.txt | grep 'not'
 
-## Filename instead of matching lines
+## Get filename instead of matching lines
 
 grep -l 'are' programming_quotes.txt search_strings.txt
 

code_snippets/Gotchas_and_Tricks.sh

@@ -62,21 +62,11 @@ time LC_ALL=C grep -xE '([a-z]..)\1' words.txt > f2
 
 rm f[12]
 
-/bin/grep --version | head -n1
-
-time /bin/grep -wE '([a-d][r-z]){3}' words.txt > f1
-
-grep --version | head -n1
-
-time grep -wE '([a-d][r-z]){3}' words.txt > f2
-
-rm f[12]
-
 ## Speed benefits with PCRE
 
 time LC_ALL=C grep -xE '([a-z]..)\1' words.txt > f1
 
-time LC_ALL=C grep -xP '([a-z]..)\1' words.txt > f2
+time grep -xP '([a-z]..)\1' words.txt > f2
 
 rm f[12]
 
@@ -94,7 +84,7 @@ time grep -rl 'include' . > ../f1
 
 time find -type f -print0 | xargs -0 grep -l 'include' > ../f2
 
-time find -type f -print0 | xargs -0 -P2 grep -l 'include' > ../f3
+time find -type f -print0 | xargs -0 -P0 grep -l 'include' > ../f3
 
 diff -sq <(sort ../f1) <(sort ../f2)
 

code_snippets/Introduction.sh

@@ -1,10 +1,10 @@
 ## Installation
 
-wget https://ftp.gnu.org/gnu/grep/grep-3.4.tar.xz
+wget https://ftp.gnu.org/gnu/grep/grep-3.6.tar.xz
 
-tar -Jxf grep-3.4.tar.xz
+tar -Jxf grep-3.6.tar.xz
 
-cd grep-3.4/
+cd grep-3.6/
 
 ./configure 
 

code_snippets/Perl_Compatible_Regular_Expressions.sh

@@ -16,9 +16,9 @@ echo '5ba\babc2' | grep -oP '[a\b]*'
 
 echo '5ba\babc2' | grep -oP '[a\\b]*'
 
-echo 'w=y\x+9*3' | grep -oE '[\w=]+'
+echo 'w=y\x+9' | grep -oE '[\w=]+'
 
-echo 'w=y\x+9*3' | grep -oP '[\w=]+'
+echo 'w=y\x+9' | grep -oP '[\w=]+'
 
 echo '123456789abc42az' | grep -E '(.)(.)(.)(.)(.)(.)(.)(.)(.)(.).*\10'
 
@@ -40,11 +40,11 @@ cat five_words.txt
 
 printf 'sub\nbit' | grep -f- five_words.txt
 
-grep -e 'sub' -e 'bit' five_words.txt 
+grep -e 'sub' -e 'bit' five_words.txt
 
 printf 'sub\nbit' | grep -P -f- five_words.txt
 
-grep -P -e 'sub' -e 'bit' five_words.txt 
+grep -P -e 'sub' -e 'bit' five_words.txt
 
 ## String anchors
 
@@ -146,9 +146,9 @@ echo 'cat scatter cater scat' | grep -oP '(?<=(cat.*?){2})cat[a-z]*'
 
 echo 'foo=42, bar=314' | grep -oP '=\K\d+'
 
-echo 'cat scatter cater scat' | grep -oP '(cat.*?){2}\Kcat[a-z]*'
+echo 'cat scatter cater scat' | grep -oP '^(.*?cat.*?){2}\Kcat[a-z]*'
 
-echo 'or42 car3 pare7 care5' | grep -oP '\b[a-z]{1,3}\K\d+'
+echo 'or42 pare7 or3 cared5' | grep -oP '\b[a-z]{1,3}\K\d+'
 
 echo 'fox,cat,dog,parrot' | grep -qP '^((?!cat).)*dog' || echo 'No match'
 
@@ -208,7 +208,7 @@ printf '@A-.\tcar' | grep -oP '\G\S'
 
 ## Skipping matches
 
-echo 'car bat cod map' | grep -oP '(bat|map)(*SKIP)(*F)|\w+'
+echo 'car bat cod map' | grep -oP '\b(bat|map)\b(*SKIP)(*F)|\w+'
 
 echo 'I like2 "mango" and "guava"' | grep -oP '"[^"]+"(*SKIP)(*F)|\w+'
 

code_snippets/Recursive_search.sh

@@ -46,6 +46,16 @@ grep -Rl --include='*.txt' --include='*.py' 'in'
 
 printf '*en\n*.txt' | grep -Rl --exclude-from=- 'in'
 
+grep -Rl --include='*on*' --exclude='*.txt' 'in'
+
+grep -Rl --exclude='*.txt' --include='*on*' 'in'
+
+grep -l 'a' scripts/*
+
+grep -l --exclude='*.sh' 'a' scripts/*
+
+grep -l --include='*.sh' 'a' scripts/*
+
 ## Extended globs
 
 shopt -s extglob globstar 

code_snippets/ripgrep.sh

@@ -2,11 +2,11 @@
 
 link='https://github.com/BurntSushi/ripgrep/releases/'
 
-link="$link"'download/12.1.0/ripgrep_12.1.0_amd64.deb'
+link="$link"'download/12.1.1/ripgrep_12.1.1_amd64.deb'
 
 wget "$link"
 
-sudo gdebi ripgrep_12.1.0_amd64.deb 
+sudo gdebi ripgrep_12.1.1_amd64.deb 
 
 rg --version
 
@@ -74,7 +74,7 @@ rg -f search_strings.txt -e 'twice' programming_quotes.txt
 
 rg 'in' programming_quotes.txt | rg 'not'
 
-## Filename instead of matching lines
+## Get filename instead of matching lines
 
 rg -l 'are' programming_quotes.txt search_strings.txt
 
@@ -414,7 +414,9 @@ echo 'foo=42, bar=314, baz:512' | rg -o '=(\d+)' -r '$1'
 
 echo '42 foo-5, baz3; x-83, y-20: f12' | rg -o '\-(\d+)[:;]' -r '$1'
 
-echo 'cat scatter cater scat' | rg -o '(?:cat.*?){2}(cat[a-z]*)' -r '$1'
+s='scatter cat cater scat concatenate abdicate'
+
+echo "$s" | rg -o '^(?:.*?cat.*?){2}(cat[a-z]*)' -r '$1'
 
 echo 'a b a' | rg 'a' -r '$${a}'
 
@@ -476,7 +478,9 @@ rg -P '(?=.*a)(?=.*e)(?=.*i)(?=.*o).*u' five_words.txt
 
 echo 'hey food! foo42 foot5 foofoo' | rg -P 'foo(?!\d)' -r 'X'
 
-echo 'cat scatter cater scat' | rg -oP '(cat.*?){2}\Kcat[a-z]*'
+s='scatter cat cater scat concatenate abdicate'
+
+echo "$s" | rg -oP '^(.*?cat.*?){2}\Kcat[a-z]*'
 
 echo 'fox,cat,dog,parrot' | rg -qP 'at((?!go).)*par' && echo 'Match'
 
@@ -486,9 +490,9 @@ expr='(a^b)'
 
 echo 'f*(2-a/b) - 3*(a^b)-42' | rg -oP '\S*\Q'"$expr"'\E\S*'
 
-echo 'car bat cod map' | rg -o '(bat|map)(*SKIP)(*F)|\w+'
+echo 'car bat cod map' | rg -o '\b(bat|map)\b(*SKIP)(*F)|\w+'
 
-echo 'car bat cod map' | rg -o --engine=auto '(bat|map)(*SKIP)(*F)|\w+'
+echo 'car bat cod map' | rg -o --engine=auto '\b(bat|map)\b(*SKIP)(*F)|\w+'
 
 ## Recursive options
 
@@ -536,6 +540,8 @@ rg 'red'
 
 rg -Ll 'red'
 
+rg --type-list | rg 'markdown'
+
 rg -t=py -t=sh --files
 
 rg -t=txt --files
@@ -550,6 +556,20 @@ rg -g='!*.py' --files
 
 rg -g='!scripts' --files
 
+mkdir double_star && cd $_
+
+mkdir -p one/two/{x,y,z}/four
+
+touch one/1.txt one/two/y/why.txt one/two/x/ex.txt one/two/y/four/4.txt
+
+rg --files
+
+rg -g='one/two/**' --files
+
+rg -g='**/y/**' --files
+
+cd .. && rm -r double_star
+
 ## Speed comparison
 
 time grep -rw 'user' > ../f1

exercises/Exercise_solutions.md

@@ -4,13 +4,13 @@
 
 # Frequently used options
 
-Create `exercises` directory and within it, create another directory for this chapter, say `freq_options` or `chapter_2`. Input is a file downloaded from internet — https://www.gutenberg.org/files/345/345.txt saved as `dracula.txt`.
+First create `exercises` directory and then within it, create another directory for this chapter, say `freq_options` or `chapter_2`. Input is a file downloaded from internet — https://www.gutenberg.org/files/345/old/345.txt saved as `dracula.txt`.
 
 **a)** Display all lines containing `ablaze`
 
 ```bash
 $ mkdir -p exercises/freq_options && cd $_
-$ wget https://www.gutenberg.org/files/345/345.txt -O dracula.txt
+$ wget https://www.gutenberg.org/files/345/old/345.txt -O dracula.txt
 
 $ grep 'ablaze' dracula.txt
 the room, his face all ablaze with excitement. He rushed up to me and
@@ -333,7 +333,7 @@ $ printf 'hi there\0good day\n' | grep -a 'good'
 hi theregood day
 ```
 
-**b)** Read about `--line-buffered` from the manual (also [this link](https://stackoverflow.com/questions/7161821/how-to-grep-a-continuous-stream)) and see it in action with code below:
+**b)** Read about `--line-buffered` from the manual (also [this link](https://stackoverflow.com/q/7161821/4082052)) and see it in action with code below:
 
 ```bash
 $ for i in {1..5}; do seq 12; sleep 1; done | grep '[1-489]' | grep -v '0'

exercises/Exercises.md

@@ -1,16 +1,18 @@
 # Exercises
 
+>![info](../images/info.svg) For solutions, see [Exercise_solutions.md](https://github.com/learnbyexample/learn_gnugrep_ripgrep/blob/master/exercises/Exercise_solutions.md).
+
 <br>
 
 # Frequently used options
 
-Create `exercises` directory and within it, create another directory for this chapter, say `freq_options` or `chapter_2`. Input is a file downloaded from internet — https://www.gutenberg.org/files/345/345.txt saved as `dracula.txt`. To solve the exercises, modify the partial command shown just before the expected output.
+First create `exercises` directory and then within it, create another directory for this chapter, say `freq_options` or `chapter_2`. Input is a file downloaded from internet — https://www.gutenberg.org/files/345/old/345.txt saved as `dracula.txt`. To solve the exercises, modify the partial command shown just before the expected output.
 
 **a)** Display all lines containing `ablaze`
 
 ```bash
 $ mkdir -p exercises/freq_options && cd $_
-$ wget https://www.gutenberg.org/files/345/345.txt -O dracula.txt
+$ wget https://www.gutenberg.org/files/345/old/345.txt -O dracula.txt
 
 $ grep ##### add your solution here
 the room, his face all ablaze with excitement. He rushed up to me and
@@ -319,7 +321,7 @@ $ printf 'hi there\0good day\n' | grep ##### add your solution here
 hi theregood day
 ```
 
-**b)** Read about `--line-buffered` from the manual (also [this link](https://stackoverflow.com/questions/7161821/how-to-grep-a-continuous-stream)) and see it in action with code below:
+**b)** Read about `--line-buffered` from the manual (also [this link](https://stackoverflow.com/q/7161821/4082052)) and see it in action with code below:
 
 ```bash
 $ for i in {1..5}; do seq 12; sleep 1; done | grep '[1-489]' | grep -v '0'