Update README.md

add color
 + other stuff

CHANGELOG

@@ -1,3 +0,0 @@
-Changelog
-=========
-

CONTRIBUTING.md

@@ -1,17 +1,29 @@
 Contributing
 ============
 If you would like to contribute cheetsheets or program functionality, please
-fork this repository, make your changes, and submit a pull request.
+fork this repository, make your changes, and submit a pull request against the
+`master` branch.
 
+
+## Python standards ##
 Python code should conform to [PEP 8][].
 
-Licensing
----------
-By contributing to the project, you agree to license your work under the same
-licenses as `cheat` itself. `cheat` is currently dual-licensed under the GPL3
-and MIT licenses, though that could change without notice in the future.
 
-`cheat`, however, will always remain free software (as in both "free as in
-freedom" and "free as in beer") and shall always be licensed accordingly.
+## Cheatsheet Format ##
+Please pattern your cheatsheets after the following:
+
+```sh
+# To extract an uncompressed archive:
+tar -xvf /path/to/foo.tar
+
+# To create an uncompressed archive:
+tar -cvf /path/to/foo.tar /path/to/foo/
+
+# To extract a .gz archive:
+tar -xzvf /path/to/foo.tgz
+```
+
+If you are submitting a cheatsheet that contains side-by-side columns of text,
+please align the columns using spaces rather than tabs.
 
 [PEP 8]: http://legacy.python.org/dev/peps/pep-0008/ 

MANIFEST.in

@@ -0,0 +1,6 @@
+include CHANGELOG
+include CONTRIBUTING.md
+include LICENSE
+include README.md
+include licenses/gpl-3.txt
+include licenses/mit.txt

README.md

@@ -1,5 +1,55 @@
-[![PyPI](https://img.shields.io/pypi/v/cheat.svg)](https://pypi.python.org/pypi/cheat/)
-[![PyPI](https://img.shields.io/pypi/dm/cheat.svg)](https://pypi.python.org/pypi/cheat/)
+Original project https://github.com/chrisallenlane/cheat 
+
+----
+
+Fork Verion [![cheapy](https://img.shields.io/badge/V%20-2.2.32-brightgreen.svg)](https://github.com/Erreur32/cheat)   
+
+Features added by by 🅴🆁🆁🅴🆄🆁32 : 
+ - Add color seach and prompt
+ - Add Subdir creation and search
+ - Add remove sheet file (-r) with confirmation
+ - Add color help text
+
+
+
+
+----
+
+
+Put in your bashrc
+
+```sh
+function _cheat_autocomplete {
+    sheets=$(cheat -l | cut -d' ' -f1)
+    COMPREPLY=()
+    if [ $COMP_CWORD = 1 ]; then
+	COMPREPLY=(`compgen -W "$sheets" -- $2`)
+    fi
+}
+
+complete -F _cheat_autocomplete cheat
+```
+
+Installing
+----------
+
+### manually ###
+First, install the dependencies:
+
+```sh
+[sudo] pip install docopt pygments appdirs
+```
+
+Then clone this repository:
+```sh
+git clone https://github.com/Erreur32/cheat.git
+```
+
+Lastly, `cd` into the cloned directory, then run:
+
+```sh
+[sudo] python setup.py install
+```
 
 cheat
 =====
@@ -8,8 +58,7 @@ command-line. It was designed to help remind \*nix system administrators of
 options for commands that they use frequently, but not frequently enough to
 remember.
 
-![The obligatory xkcd](http://imgs.xkcd.com/comics/tar.png 'The obligatory xkcd')
-
+ 
 
 Example
 -------
@@ -45,17 +94,7 @@ Note that, while `cheat` was designed primarily for \*nix system administrators,
 it is agnostic as to what content it stores. If you would like to use `cheat`
 to store notes on your favorite cookie recipes, feel free.
 
-
-Installing
-----------
-It is recommended to install `cheat` with `pip`:
-
-```sh
-[sudo] pip install cheat
-```
-
-[Other installation methods are available][installing].
-
+ 
 
 Modifying Cheatsheets
 ---------------------
@@ -67,14 +106,14 @@ Cheatsheets are stored in the `~/.cheat/` directory, and are named on a
 per-keyphrase basis. In other words, the content for the `tar` cheatsheet lives
 in the `~/.cheat/tar` file.
 
-Provided that you have an `EDITOR` environment variable set, you may edit
-cheatsheets with:
+Provided that you have a `CHEAT_EDITOR`, `VISUAL`, or `EDITOR` environment
+variable set, you may edit cheatsheets with:
 
 ```sh
 cheat -e foo
 ```
 
-If the 'foo' cheatsheet already exists, it will be opened for editing.
+If the `foo` cheatsheet already exists, it will be opened for editing.
 Otherwise, it will be created automatically.
 
 After you've customized your cheatsheets, I urge you to track `~/.cheat/` along
@@ -110,13 +149,32 @@ export CHEATPATH="$CHEATPATH:/path/to/more/cheats"
 You may view which directories are on your `CHEATPATH` with `cheat -d`.
 
 ### Enabling Syntax Highlighting ###
-`cheat` can apply syntax highlighting to your cheatsheets if so desired. To
-enable this feature, set a `CHEATCOLORS` environment variable:
+`cheat` can optionally apply syntax highlighting to your cheatsheets. To enable
+syntax highlighting, export a `CHEATCOLORS` environment variable:
 
 ```sh
 export CHEATCOLORS=true
 ```
 
+#### Specifying a Syntax Highlighter ####
+You may manually specify which syntax highlighter to use for each cheatsheet by
+wrapping the sheet's contents in a [Github-Flavored Markdown code-fence][gfm].
+
+Example:
+
+<pre>
+```sql
+-- to select a user by ID
+SELECT *
+FROM Users
+WHERE id = 100
+```
+</pre>
+
+If no syntax highlighter is specified, the `bash` highlighter will be used by
+default.
+
+
 See Also:
 ---------
 - [Enabling Command-line Autocompletion][autocompletion]
@@ -125,5 +183,6 @@ See Also:
 
 [autocompletion]:   https://github.com/chrisallenlane/cheat/wiki/Enabling-Command-line-Autocompletion
 [dotfiles]:         http://dotfiles.github.io/
+[gfm]:              https://help.github.com/articles/creating-and-highlighting-code-blocks/
 [installing]:       https://github.com/chrisallenlane/cheat/wiki/Installing
 [related-projects]: https://github.com/chrisallenlane/cheat/wiki/Related-Projects

bin/cheat

@@ -1,33 +1,39 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 
 """cheat
 
+Create and view cheatsheets on the command line.
+
 Usage:
-  cheat <cheatsheet>
-  cheat -e <cheatsheet>
-  cheat -s <keyword>
-  cheat -l
-  cheat -d
-  cheat -v
-
-cheat allows you to create and view interactive cheatsheets on the
-command-line. It was designed to help remind *nix system
-administrators of options for commands that they use frequently,
-but not frequently enough to remember.
-
-Examples:
-  To look up 'tar':
-  cheat tar
-
-  To create or edit the cheatsheet for 'foo':
-  cheat -e foo
+  \033[1;32mcheat\033[0m <cheatsheet>
+  \033[1;32mcheat\033[0m -e <cheatsheet>
+  \033[1;32mcheat\033[0m -s <keyword> [<cheatsheet>]
+  \033[1;32mcheat\033[0m -l
+  \033[1;32mcheat\033[0m -d
+  \033[1;32mcheat\033[0m -v
+  \033[1;32mcheat\033[0m -r <cheatsheet>
 
 Options:
   -d --directories  List directories on CHEATPATH
   -e --edit         Edit cheatsheet
   -l --list         List cheatsheets
-  -s --search       Search cheatsheets for <keyword>
+  -s --search       Search cheatsheets for <keyword> and [<cheatsheet>] file
   -v --version      Print the version number
+  -r --remove       Delete Cheatsheet
+
+Examples:
+
+  To view the `tar` cheatsheet:
+  \033[1;31m  cheat \033[0m tar
+
+  To edit (or create) the `foo` cheatsheet:
+    cheat -e foo
+
+  To list all available cheatsheets:
+    cheat -l
+
+  To search for "ssh" among all cheatsheets:
+    cheat -s ssh
 """
 
 # require the dependencies
@@ -38,7 +44,7 @@ from docopt import docopt
 
 if __name__ == '__main__':
     # parse the command-line options
-    options = docopt(__doc__, version='cheat 2.1.26')
+    options = docopt(__doc__, version='cheat 2.2.3')
 
     # list directories
     if options['--directories']:
@@ -54,7 +60,11 @@ if __name__ == '__main__':
 
     # search among the cheatsheets
     elif options['--search']:
-        print(colorize(sheets.search(options['<keyword>'])))
+        print(colorize(sheets.search(options['<keyword>'], options['<cheatsheet>'])))
+
+    # remove File in the cheatsheets
+    elif options['--remove']:
+        sheet.remove(options['<cheatsheet>'])
 
     # print the cheatsheet
     else:

cheat/cheatsheets/7z

@@ -11,7 +11,7 @@ u       update
 x       extract with full paths
 
 Example:
-7z a -t7z -m0-lzma -mx=9 -mfb=64 -md=32m -ms=on archive.7z dir1
+7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on archive.7z dir1
 
 -t7z        7z archive
 -m0=lzma    lzma method

cheat/cheatsheets/alias

@@ -0,0 +1,5 @@
+# Show a list of your current shell aliases
+alias
+
+# Map `ll` to `ls -l` (Can be used per session or put inside a shell config file)
+alias ll='ls -l'

cheat/cheatsheets/aria2c

@@ -0,0 +1,12 @@
+# Just download a file
+# The url can be a http(s), ftp, .torrent file or even a magnet link
+aria2c <url>
+
+# To prevent downloading the .torrent file
+aria2c --follow-torrent=mem <url>
+
+# Download 1 file at a time (-j) 
+# continuing (-c) any partially downloaded ones
+# to the directory specified (-d)
+# reading urls from the file (-i)
+aria2c -j 1 -c -d ~/Downloads -i /path/to/file

cheat/cheatsheets/bzip2

@@ -0,0 +1,11 @@
+# compress foo -> foo.bz2
+bzip2 -z foo
+
+# decompress foo.bz2 -> foo
+bzip2 -d foo.bz2
+
+# compress foo to stdout
+bzip2 -zc foo > foo.bz2
+
+# decompress foo.bz2 to stdout
+bzip2 -dc foo.bz2

cheat/cheatsheets/cat

@@ -0,0 +1,8 @@
+# Display the contents of a file
+cat /path/to/foo
+
+# Display contents with line numbers
+cat -n /path/to/foo
+
+# Display contents with line numbers (blank lines excluded)
+cat -b /path/to/foo

cheat/cheatsheets/cd

@@ -0,0 +1,11 @@
+#Go to the given directory
+cd path/to/directory
+
+#Go to home directory of current user
+cd
+
+#Go up to the parent of the current directory
+cd ..
+
+#Go to the previously chosen directory
+cd -

cheat/cheatsheets/cheat

@@ -0,0 +1,14 @@
+# To see example usage of a program:
+cheat <command>
+
+# To edit a cheatsheet
+cheat -e <command>
+
+# To list available cheatsheets
+cheat -l
+
+# To search available cheatsheets
+cheat -s <command>
+
+# To get the current `cheat' version
+cheat -v

cheat/cheatsheets/cp

@@ -0,0 +1,11 @@
+# Create a copy of a file
+cp ~/Desktop/foo.txt ~/Downloads/foo.txt
+
+# Create a copy of a directory
+cp -r ~/Desktop/cruise_pics/ ~/Pictures/
+
+# Create a copy but ask to overwrite if the destination file already exists
+cp -i ~/Desktop/foo.txt ~/Documents/foo.txt
+
+# Create a backup file with date
+cp foo.txt{,."$(date +%Y%m%d-%H%M%S)"}

cheat/cheatsheets/crontab

@@ -16,7 +16,7 @@ SHELL=/bin/bash
 */15 * * * * /home/user/command.sh
 
 # every midnight
-* 0 * * * /home/user/command.sh
+0 0 * * * /home/user/command.sh
 
 # every Saturday at 8:05 AM
 5 8 * * 6 /home/user/command.sh

cheat/cheatsheets/cryptsetup

@@ -0,0 +1,8 @@
+# open encrypted partition /dev/sdb1 (reachable at /dev/mapper/backup)
+cryptsetup open --type luks /dev/sdb1 backup
+
+# open encrypted partition /dev/sdb1 using a keyfile (reachable at /dev/mapper/hdd)
+cryptsetup open --type luks --key-file hdd.key /dev/sdb1 hdd
+
+# close luks container at /dev/mapper/hdd
+cryptsetup close hdd

cheat/cheatsheets/curl

@@ -33,3 +33,9 @@ curl http://ifconfig.me/all/json
 
 # Limit the rate of a download
 curl --limit-rate 1000B -O http://path.to.the/file
+
+# Get your global IP
+curl httpbin.org/ip 
+
+# Get only the HTTP status code
+curl -o /dev/null -w '%{http_code}\n' -s -I URL

cheat/cheatsheets/dd

@@ -1,7 +1,7 @@
 # Read from {/dev/urandom} 2*512 Bytes and put it into {/tmp/test.txt}
 # Note: At the first iteration, we read 512 Bytes.
 # Note: At the second iteration, we read 512 Bytes.
-dd if=/dev/urandom of=/tmp/test.txt count=512 bs=2
+dd if=/dev/urandom of=/tmp/test.txt count=2 bs=512
 
 # Watch the progress of 'dd'
 dd if=/dev/zero of=/dev/null bs=4KB &; export dd_pid=`pgrep '^dd'`; while [[ -d /proc/$dd_pid ]]; do kill -USR1 $dd_pid && sleep 1 && clear; done

cheat/cheatsheets/deb

@@ -0,0 +1,7 @@
+# Extract contents of a .deb file
+$ ar vx foo.deb    # -> data.tar.gz
+$ tar xf data.tar.gz
+
+# Install .deb file to a debian like system, e.g. ubuntu
+$ sudo dpkg -i foo.deb
+$ sudo apt-get install -f

cheat/cheatsheets/diff

@@ -21,3 +21,6 @@ diff -s version1 version2
 
 # To diff the output of two commands or scripts:
 diff <(command1) <(command2)
+
+# Generate a patch file from two files
+diff -Naur version1 version2 > version.patch

cheat/cheatsheets/emacs

@@ -1,21 +1,28 @@
+# Running emacs
+
+  GUI mode            $ emacs
+  Terminal mode       $ emacs -nw
+
 # Basic usage
 
   Indent              Select text then press TAB
   Cut                 CTRL-w
   Copy                ALT-w
-  Paste               CTRL-y
+  Paste ("yank")      CTRL-y
+  Begin selection     CTRL-SPACE
   Search/Find         CTRL-s
   Replace             ALT-% (ALT-SHIFT-5)
   Save                CTRL-x CTRL-s
+  Save as             CTRL-x CTRL-w
   Load/Open           CTRL-x CTRL-f
   Undo                CTRL-x u
   Highlight all text  CTRL-x h
   Directory listing   CTRL-x d
-  Cancel a command    ESC ESC ESC
+  Cancel a command    CTRL-g
   Font size bigger    CTRL-x CTRL-+
   Font size smaller   CTRL-x CTRL--
 
-#  Buffers
+# Buffers
 
   Split screen vertically                         CTRL-x 2
   Split screen vertically with 5 row height       CTRL-u 5 CTRL-x 2
@@ -23,11 +30,21 @@
   Split screen horizontally with 24 column width  CTRL-u 24 CTRL-x 3
   Revert to single screen                         CTRL-x 1
   Hide the current screen                         CTRL-x 0
-  Kill the current screen                         CTRL-x k
-  Move to the next buffer                         CTRL-x O
+  Move to the next screen                         CTRL-x o
+  Kill the current buffer                         CTRL-x k
   Select a buffer                                 CTRL-x b
   Run command in the scratch buffer               CTRL-x CTRL-e
 
+# Navigation ( backward / forward )
+  
+  Character-wise                                  CTRL-b , CTRL-f
+  Word-wise                                       ALT-b  , ALT-f
+  Line-wise                                       CTRL-p , CTRL-n
+  Sentence-wise                                   ALT-a  , ALT-e
+  Paragraph-wise                                  ALT-{ , ALT-}
+  Function-wise                                   CTRL-ALT-a , CTRL-ALT-e
+  Line beginning / end                            CTRL-a , CTRL-e
+
 # Other stuff
 
   Open a shell         ALT-x eshell
@@ -39,32 +56,9 @@
   Compile some code    ALT-x compile
   List packages        ALT-x package-list-packages
 
-#  Sudoing within eshell
-
-  By default when using the sudo command within eshell you'll just
-  get "permission denied" messages. To overcome that type:
-
-    alias sudo '*sudo $*'
-
 # Line numbers
 
   To add line numbers and enable moving to a line with CTRL-l:
 
     (global-set-key "\C-l" 'goto-line)
     (add-hook 'find-file-hook (lambda () (linum-mode 1)))
-
-# Org-mode
-
-  To begin org-mode                            ALT-x org-mode
-  Table column separator                       Vertical/pipe character
-  Reorganize table                             TAB
-  Section heading                              *
-  Open/collapse section                        TAB
-  Open/collapse All                            CTRL-TAB
-  Export in other file formats (eg HTML,PDF)   CTRL-c CTRL-e
-
-  To make org-mode automatically wrap lines:
-
-    (add-hook 'org-mode-hook
-              '(lambda ()
-                 (visual-line-mode 1)))

cheat/cheatsheets/export

@@ -0,0 +1,5 @@
+# Calling export with no arguments will show current shell attributes
+export
+
+# Create new environment variable
+export VARNAME="value"

cheat/cheatsheets/ffmpeg

@@ -2,7 +2,17 @@
 ffmpeg -i path/to/file.ext
 
 # Convert all m4a files to mp3
-for f in *.m4a; do ffmpeg -i "$f" -acodec libmp3lame -ab 320k "${f%.m4a}.mp3"; done
+for f in *.m4a; do ffmpeg -i "$f" -acodec libmp3lame -vn -b:a 320k "${f%.m4a}.mp3"; done
+
+# Convert video from .foo to .bar
+# -g : GOP, for searchability
+ffmpeg -i input.foo -vcodec bar -acodec baz -b:v 21000k -b:a 320k -g 150 -threads 4 output.bar
+
+# Convert image sequence to video
+ffmpeg -r 18 -pattern_type glob -i '*.png' -b:v 21000k -s hd1080 -vcodec vp9 -an -pix_fmt yuv420p -deinterlace output.ext
+
+# Combine video and audio into one file
+ffmpeg -i video.ext -i audio.ext -c:v copy -c:a copy output.ext
 
 # Listen to 10 seconds of audio from a video file
 #
@@ -10,3 +20,4 @@ for f in *.m4a; do ffmpeg -i "$f" -acodec libmp3lame -ab 320k "${f%.m4a}.mp3"; d
 # -t  : seconds to cut
 # -autoexit : closes ffplay as soon as the audio finishes
 ffmpeg -ss 00:34:24.85 -t 10 -i path/to/file.mp4 -f mp3 pipe:play | ffplay -i pipe:play -autoexit
+

cheat/cheatsheets/find

@@ -19,11 +19,11 @@ find ./path/ -name '*.txt' -exec rm '{}' \;
 # To find files with extension '.txt' and look for a string into them:
 find ./path/ -name '*.txt' | xargs grep 'string'
 
-# To find files with size bigger than 5 Mb and sort them by size:
+# To find files with size bigger than 5 Mebibyte and sort them by size:
 find . -size +5M -type f -print0 | xargs -0 ls -Ssh | sort -z
 
-# To find files bigger thank 2 MB and list them:
-find . -type f -size +20000k -exec ls -lh {} \; | awk '{ print $9 ": " $5 }'
+# To find files bigger than 2 Megabyte and list them:
+find . -type f -size +200000000c -exec ls -lh {} \; | awk '{ print $9 ": " $5 }'
 
 # To find files modified more than 7 days ago and list file information
 find . -type f -mtime +7d -ls

cheat/cheatsheets/git

@@ -11,6 +11,24 @@ git config --global color.ui true
 # To stage all changes for commit:
 git add --all
 
+# To stash changes locally, this will keep the changes in a separate changelist
+# called stash and the working directory is cleaned. You can apply changes
+# from the stash anytime
+git stash
+
+# To stash changes with a message
+git stash save "message"
+
+# To list all the stashed changes
+git stash list
+
+# To apply the most recent change and remove the stash from the stash list
+git stash pop
+
+# To apply any stash from the list of stashes. This does not remove the stash
+# from the stash list
+git stash apply stash@{6}
+
 # To commit staged changes
 git commit -m "Your commit message"
 
@@ -124,3 +142,10 @@ git show :/cool
 
 # Undo parts of last commit in a specific file
 git checkout -p HEAD^ -- /path/to/file
+
+# Revert a commit and keep the history of the reverted change as a separate revert commit
+git revert <commit SHA>
+
+# Pich a commit from a branch to current branch. This is different than merge as
+# this just applies a single commit from a branch to current branch
+git cherry-pick <commit SHA1>

cheat/cheatsheets/gyb

@@ -0,0 +1,12 @@
+# To estimate the number and the size of all mails on youremail@gmail.com
+gyb --email youremail@gmail.com --action estimate
+
+# To backup from youremail@gmail.com to your local-folder 
+gyb --email youremail@gmail.com --action backup --local-folder "~/MyLocalFolder/"
+
+# To backup from youremail@gmail.com only important or starred emails to the
+# default local folder GYB-GMail-Backup-youremail@gmail.com
+gyb --email youremail@gmail.com --search "is:important OR is:starred"
+
+# To restore from your local-folder to youremail@gmail.com
+gyb --email youremail@gmail.com --action restore --local-folder "~/MyLocalFolder/" 

cheat/cheatsheets/hg

@@ -0,0 +1,20 @@
+# Clone a directory
+hg clone
+
+# Add files to hg tracker
+hg add filename
+
+# Add all files in a folder to hg tracker
+hg add folder/
+
+# Create a commit with all tracked changes and a message
+hg commit -m "message"
+
+# Push commits to source repository
+hg push
+
+# Pull changes from source repository
+hg pull
+
+# Rebase local commits to disambiguate with remote repository
+hg pull --rebase

cheat/cheatsheets/iconv

@@ -0,0 +1,3 @@
+# To convert file (iconv.src) from iso-8859-1 to utf-8 and save to
+# /tmp/iconv.out
+iconv -f iso-8859-1 -t utf-8 iconv.src -o /tmp/iconv.out

cheat/cheatsheets/kill

@@ -0,0 +1,5 @@
+# Kill a process gracefully
+kill -15 <process id>
+
+# Kill a process forcefully
+kill -9 <process id>

cheat/cheatsheets/lsof

@@ -4,20 +4,34 @@ sudo lsof -i4
 # List all IPv6 network files
 sudo lsof -i6
 
-# To find listening ports:
+# List all open sockets
+lsof -i
+
+# List all listening ports
 lsof -Pnl +M -i4
 
-# To find which program is using the port 80:
+# Find which program is using the port 80
 lsof -i TCP:80
 
+# List all connections to a specific host
+lsof -i@192.168.1.5
+
 # List all processes accessing a particular file/directory
 lsof </path/to/file>
 
 # List all files open for a particular user
 lsof -u <username>
 
-# List all files/network connections a given process is using
+# List all files/network connections a command is using
 lsof -c <command-name>
 
+# List all files a process has open
+lsof -p <pid>
+
+# List all files open mounted at /mount/point.
+# Particularly useful for finding which process(es) are using a
+# mounted USB stick or CD/DVD.
+lsof +f -- </mount/point>
+
 # See this primer: http://www.danielmiessler.com/study/lsof/
 # for a number of other useful lsof tips

cheat/cheatsheets/mv

@@ -0,0 +1,14 @@
+# Move a file from one place to another
+mv ~/Desktop/foo.txt ~/Documents/foo.txt
+
+# Move a file from one place to another and automatically overwrite if the destination file exists
+# (This will override any previous -i or -n args)
+mv -f ~/Desktop/foo.txt ~/Documents/foo.txt
+
+# Move a file from one place to another but ask before overwriting an existing file
+# (This will override any previous -f or -n args)
+mv -i ~/Desktop/foo.txt ~/Documents/foo.txt
+
+# Move a file from one place to another but never overwrite anything
+# (This will override any previous -f or -i args)
+mv -n ~/Desktop/foo.txt ~/Documents/foo.txt

cheat/cheatsheets/mysql

@@ -28,4 +28,10 @@ INSERT INTO tbl_name (col1,col2) VALUES(15,col1*2);
 UPDATE tbl_name SET col1 = "example";
 
 # Basic DELETE Statement
-DELETE FROM tbl_name WHERE user = 'jcole';
+DELETE FROM tbl_name WHERE user = 'jcole';
+
+# To check stored procedure
+SHOW PROCEDURE STATUS;
+
+# To check stored function
+SHOW FUNCTION STATUS;

cheat/cheatsheets/npm

@@ -0,0 +1,22 @@
+# Every command shown here can be used with the `-g` switch for global scope
+
+# Install a package in the current directory
+npm install <package>
+
+# Install a package, and save it in the `dependencies` section of `package.json`
+npm install --save <package>
+
+# Install a package, and save it in the `devDependencies` section of `package.json`
+npm install --save-dev <package>
+
+# Show outdated packages in the current directory
+npm outdated
+
+# Update outdated packages
+npm update
+
+# Update `npm` (will override the one shipped with Node.js)
+npm install -g npm
+
+# Uninstall a package
+npm uninstall <package>

cheat/cheatsheets/openssl

@@ -15,6 +15,9 @@ openssl req -text -noout -in server.csr
 # To show certificate information for generated certificate
 openssl x509 -text -noout -in server.crt 
 
+# To get the sha256 fingerprint of a certificate
+openssl x509 -in server.crt -noout -sha256 -fingerprint
+
 # To view certificate expiration:
 echo | openssl s_client -connect <hostname>:443 2> /dev/null | \
 awk '/-----BEGIN/,/END CERTIFICATE-----/' | \

cheat/cheatsheets/org-mode

@@ -0,0 +1,46 @@
+  Begin org-mode                               ALT-x org-mode
+  Save                                         CTRL-x CTRL-s
+  Export in other file formats (eg HTML,PDF)   CTRL-c CTRL-e
+
+# Outline
+
+  Section heading                              *
+  New headline                                 ALT-return
+  Move headline up or down                     ALT-up_arrow/down_arrow
+  Adjust indent depth of headline              ALT-left_arrow/right_arrow
+  Open/collapse section                        TAB
+  Open/collapse All                            CTRL-TAB
+
+# To-Do Lists
+
+  Mark list item as TODO                       ** TODO
+  Cycle through workflow                       SHIFT-left_arrow/right_arrow
+  Show only outstanding TODO                   items CTRL-c CTRL-v
+
+# Tables
+
+  Table column separator                       Vertical/pipe character
+  Reorganize table                             TAB
+  Move column                                  ALT-left_arrow/right_arrow
+  Move row                                     ALT-up_arrow/down_arrow
+
+# Styles
+
+  *bold*
+  /italic/
+  _underlined_
+  =code=
+  ~verbatim~
+  +strike-through+
+
+# Heading
+
+  Header         -*- mode: org -*-
+
+# .emacs
+
+  To make org-mode automatically wrap lines:
+
+    (add-hook 'org-mode-hook
+              '(lambda ()
+                 (visual-line-mode 1)))

cheat/cheatsheets/patch

@@ -0,0 +1,13 @@
+# Patch one file
+patch version1 < version.patch
+
+# Reverse a patch
+patch -R version1 < version.patch
+
+# Patch all files in a directory, adding any missing new files
+# -p strips leading slashes
+$ cd dir
+$ patch -p1 -i ../big.patch
+
+# Patch files in a directory, with one level (/) offset
+patch -p1 -r version1/ < version.patch

cheat/cheatsheets/perl

@@ -0,0 +1,8 @@
+# To view the perl version:
+perl -v
+
+# Replace string "\n" to newline
+echo -e "foo\nbar\nbaz" | perl -pe 's/\n/\\n/g;'
+
+# Replace newline with multiple line to space
+cat test.txt | perl -0pe "s/test1\ntest2/test1 test2/m"

cheat/cheatsheets/pgrep

@@ -0,0 +1,5 @@
+# Get a list of PIDs matching the pattern 
+pgrep example
+
+# Kill all PIDs matching the pattern
+pgrep -f example | xargs kill

cheat/cheatsheets/pip

@@ -23,5 +23,8 @@ pip list --outdated
 # Upgrade all outdated packages, thanks to http://stackoverflow.com/a/3452888
 pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xargs -n1 pip install -U
 
+# Upgrade outdated packages on latest version of pip
+pip list --outdated --format=freeze | cut -d = -f 1 | xargs -n1 pip install -U
+
 # Install specific version of a package
 pip install -I SomePackage1==1.1.0 'SomePackage2>=1.0.4'

cheat/cheatsheets/pkgtools

@@ -0,0 +1,27 @@
+# Create a Slackware package from a structured directory and sub-tree
+$ cd /path/to/pkg/dir
+$ su - c 'makepkg --linkadd y --chown n $foo-1.0.3-x86_64-1_tag.tgz'
+
+
+# Install a Slackware package
+installpkg foo-1.0.3-x86_64-1.tgz
+
+# Install a Slackware package to non-standard location
+ROOT=/path/to/dir installpkg foo-1.0.4-noarch-1.tgz
+
+# Create backup of files that will be overwritten when installing
+tar czvf /tmp/backup.tar.gz $(installpkg --warn foo-1.0.4-noarch-1.tgz)
+
+
+# Upgrade a Slackware package including files only in new version
+upgradepkg --install-new foo-1.0.6-noarch-1.tgz
+
+# Upgrade a Slackware package even if version is the same
+upgradepkg --reinstall foo-1.0.4-noarch-1.tgz
+
+
+# Remove a Slackware package
+removepkg foo-0.2.8-x86_64-1
+
+# Remove a Slackware package, retaining a backup (uninstalled) copy
+removepkg -copy foo-0.2.8-x86_64-1  # -> /var/log/setup/tmp/preserved_packages/foo...

cheat/cheatsheets/pkill

@@ -0,0 +1,5 @@
+# To kill a process using it's full process name
+pkill <processname>
+
+# To kill a process by it's partial name
+pkill -f <string>

cheat/cheatsheets/popd

@@ -0,0 +1,2 @@
+# Returns to the directory at the top of the `pushd' stack
+popd

cheat/cheatsheets/psql

@@ -0,0 +1,26 @@
+# psql is the PostgreSQL terminal interface. The following commands were tested on version 9.5.
+# Connection options:
+# -U username (if not specified current OS user is used).
+# -p port.
+# -h server hostname/address.
+
+# Connect to a specific database:
+psql -U postgres -h serverAddress -d dbName
+
+# Get databases on a server:
+psql -U postgres -h serverAddress --list
+
+# Execute sql query and save output to file:
+psql -U postgres -d dbName -c 'select * from tableName;' -o fileName
+
+# Execute query and get tabular html output:
+psql -U postgres -d dbName -H -c 'select * from tableName;'
+
+# Execute query and save resulting rows to csv file:
+psql -U postgres -d dbName -t -A -P fieldsep=',' -c 'select * from tableName;' -o fileName.csv
+
+# Read commands from file:
+psql -f fileName
+
+# Restore databases from file:
+psql -f fileName.backup postgres

cheat/cheatsheets/pushd

@@ -0,0 +1,5 @@
+# Pushes your current directory to the top of a stack while changing to the specified directory
+pushd <directory>
+
+# To return use popd
+popd

cheat/cheatsheets/pwd

@@ -0,0 +1,2 @@
+# Show the absolute path of your current working directory on the filesystem
+pwd

cheat/cheatsheets/rcs

@@ -0,0 +1,26 @@
+# Initial check-in of file (leaving file active in filesystem)
+ci -u <filename>
+
+# Check out with lock
+co -l <filename>
+
+# Check in and unlock (leaving file active in filesystem)
+ci -u <filename>
+
+# Display version x.y of a file
+co -px.y <filename>
+
+# Undo to version x.y (overwrites file active in filesystem with the specified revision)
+co -rx.y <filename>
+
+# Diff file active in filesystem and last revision
+rcsdiff <filename>
+
+# Diff versions x.y and x.z
+rcsdiff -rx.y -rx.z <filename>
+
+# View log of check-ins
+rlog <filename>
+
+# Break an RCS lock held by another person on a file
+rcs -u <filename>

cheat/cheatsheets/rpm2cpio

@@ -0,0 +1,5 @@
+# List contents of RPM
+rpm2cpio foo.rpm | cpio -vt
+
+# Extract contents of RPM
+rpm2cpio foo.rpm | cpio -vid

cheat/cheatsheets/shutdown

@@ -0,0 +1,8 @@
+# Reboot the system immediately
+shutdown -r now
+
+# Shut system down immediately
+shutdown -h now
+
+# Reboot system after 5 minutes
+shutdown -r +5

cheat/cheatsheets/sport

@@ -0,0 +1,32 @@
+# Sync to newest SlackBuild.org tree
+sport r
+
+# Search (fuzzy) SlackBuild tree for packages foo and BaR
+sport s foo bar
+
+# Operate from alternate build tree
+SBOPATH=/path/to/tree sport s foo
+
+# View info and README of BaR (not fuzzy)
+sport c foo BaR
+
+# Build a package
+sport i --build-only foo
+
+# Build and install package foo and BaR
+sport i foo BaR
+
+# Build and install package from current directory
+sport i .
+
+# Upgrade instead of install
+INSTALLER=upgradepkg sport i foo
+
+# Build dependency list for baz
+echo "foo BaR" >> /tmp/baz.list
+
+# Install list of packages from file
+sport i $(< /tmp/baz.list)
+
+# Check if package is installed
+sport k foo

cheat/cheatsheets/sqlite3

@@ -0,0 +1,20 @@
+# create database and launch interactive shell
+sqlite3 example.db
+
+# create table
+sqlite3 example.db "CREATE TABLE Os(ID INTEGER PRIMARY KEY, Name TEXT, Year INTEGER);"
+
+# insert data
+sqlite3 example.db "INSERT INTO 'Os' VALUES(1,'Linux',1991);"
+
+# list tables
+sqlite3 example.db ".tables"
+
+# view records in table
+sqlite3 example.db "SELECT * FROM 'Os';"
+
+# view records in table conditionally
+sqlite example.db "SELECT * FROM 'Os' WHERE Year='1991';"
+
+# view records with fuzzy matching
+sqlite3 ~/example.db "SELECT * FROM 'Os' WHERE Year like '19%';"

cheat/cheatsheets/su

@@ -0,0 +1,2 @@
+# Switch to another user account
+su USERNAME

cheat/cheatsheets/tar

@@ -19,6 +19,9 @@ tar -xjvf /path/to/foo.tgz
 # To create a .bz2 archive:
 tar -cjvf /path/to/foo.tgz /path/to/foo/
 
+# To extract a .tar in specified Directory:
+tar -xvf /path/to/foo.tar -C /path/to/destination/
+
 # To list the content of an .bz2 archive:
 tar -jtvf /path/to/foo.tgz
 

cheat/cheatsheets/trashy

@@ -0,0 +1,14 @@
+# Trash foo and bar
+trash foo bar
+
+# Trash "foo bar"
+trash foo\ bar
+
+# List files in trash
+trash -v --list
+
+# Restore foo from trash
+trash --restore foo
+
+# Empty trash
+trash --empty

cheat/cheatsheets/urpm

@@ -0,0 +1,14 @@
+# search (fuzzy) for package foo
+urpmq -Y foo
+
+# check if foo is installed
+rpm -q foo
+
+# install package foo
+urpmi foo
+
+# download but don't install foo
+urpmi --no-install foo
+
+# uninstall package foo
+urpme foo

cheat/cheatsheets/wc

@@ -0,0 +1,18 @@
+# Count the number of words (file or STDIN)
+wc -w /path/to/foo.txt
+cat /path/to/foo.txt | wc -w
+
+# Count the number of lines (file or STDIN)
+wc -l /path/to/foo.txt
+cat /path/to/foo.txt | wc -l
+
+# Count the number of bytes (file or STDIN)
+wc -c /path/to/foo.txt
+cat /path/to/foo.txt | wc -c
+
+# Count files and directories at a given location
+ls -l | wc -l
+
+# If you ever use `wc` in a shell script and need to compare the output with an int you can
+# clean the output (wc returns extra characters around the integer) by using xargs:
+ls -l | wc -l | xargs

cheat/cheatsheets/xargs

@@ -10,3 +10,7 @@ find -name *.pdf | xargs -I{} rm -rf '{}'
 # -n1 => One file by one file. ( -n2 => 2 files by 2 files )
 
 find -name *.pdf | xargs -I{} -n1 echo '&{}='
+
+# If find returns no result, do not run rm
+# This option is a GNU extension.
+find -name "*.pdf" | xargs --no-run-if-empty rm

cheat/cheatsheets/xmlto

@@ -0,0 +1,14 @@
+# DocBook XML to PDF
+xmlto pdf mydoc.xml
+
+# DocBook XML to HTML
+xmlto -o html-dir html mydoc.xml
+
+# DocBook XML to single HTML file
+xmlto html-nochunks mydoc.xml
+
+# modify output with XSL override
+xmlto -m ulink.xsl pdf mydoc.xml
+
+# use non-default xsl
+xmlto -x mystylesheet.xsl pdf mydoc.xml

cheat/cheatsheets/youtube-dl

@@ -16,5 +16,8 @@ youtube-dl --playlist-start 5 example.com/watch?v=id&list=listid
 # To simulate a download with youtube-dl:
 youtube-dl -s example.com/watch?v=id
 
+# To download audio in mp3 format with best quality available
+youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 example.com/watch?v=id
+
 # For all video formats see
 # http://en.wikipedia.org/wiki/YouTube#Quality_and_codecs

cheat/cheatsheets/zsh

@@ -0,0 +1,82 @@
+# A plain old glob
+print -l *.txt
+print -l **/*.txt
+
+# Show text files that end in a number from 1 to 10
+print -l **/*<1-10>.txt
+
+# Show text files that start with the letter a
+print -l **/[a]*.txt
+
+# Show text files that start with either ab or bc
+print -l **/(ab|bc)*.txt
+
+# Show text files that don't start with a lower or uppercase c
+print -l **/[^cC]*.txt
+
+# Show only directories
+print -l **/*(/)
+
+# Show only regular files
+print -l **/*(.)
+
+# Show empty files
+print -l **/*(L0)
+
+# Show files greater than 3 KB
+print -l **/*(Lk+3)
+
+# Show files modified in the last hour
+print -l **/*(mh-1)
+
+# Sort files from most to least recently modified and show the last 3
+print -l **/*(om[1,3])
+
+# `.` show files, `Lm-2` smaller than 2MB, `mh-1` modified in last hour,
+# `om` sort by modification date, `[1,3]` only first 3 files
+print -l **/*(.Lm-2mh-1om[1,3])
+
+# Show every directory that contain directory `.git`
+print -l **/*(e:'[[ -d $REPLY/.git ]]':)
+
+# Return the file name (t stands for tail)
+print -l *.txt(:t)
+
+# Return the file name without the extension (r stands for remove_extension)
+print -l *.txt(:t:r)
+
+# Return the extension
+print -l *.txt(:e)
+
+# Return the parent folder of the file (h stands for head)
+print -l *.txt(:h)
+
+# Return the parent folder of the parent
+print -l *.txt(:h:h)
+
+# Return the parent folder of the first file
+print -l *.txt([1]:h)
+
+# Parameter expansion
+files=(*.txt)          # store a glob in a variable
+print -l $files
+print -l $files(:h)    # this is the syntax we saw before
+print -l ${files:h}
+print -l ${files(:h)}  # don't mix the two, or you'll get an error
+print -l ${files:u}    # the :u modifier makes the text uppercase
+
+# :s modifier
+variable="path/aaabcd"
+echo ${variable:s/bc/BC/}    # path/aaaBCd
+echo ${variable:s_bc_BC_}    # path/aaaBCd
+echo ${variable:s/\//./}     # path.aaabcd (escaping the slash \/)
+echo ${variable:s_/_._}      # path.aaabcd (slightly more readable)
+echo ${variable:s/a/A/}      # pAth/aaabcd (only first A is replaced)
+echo ${variable:gs/a/A/}     # pAth/AAAbcd (all A is replaced)
+
+# Split the file name at each underscore
+echo ${(s._.)file}
+
+# Join expansion flag, opposite of the split flag.
+array=(a b c d)
+echo ${(j.-.)array} # a-b-c-d

cheat/sheet.py

@@ -1,9 +1,9 @@
+import sys
 import os
 import shutil
-import subprocess
 
 from cheat import sheets
-from cheat.utils import die, editor
+from cheat.utils import die, open_with_editor
 
 def copy(current_sheet_path, new_sheet_path):
     """ Copies a sheet to a new path """
@@ -39,22 +39,12 @@ def create_or_edit(sheet):
 def create(sheet):
     """ Creates a cheatsheet """
     new_sheet_path = os.path.join(sheets.default_path(), sheet)
-
-    try:
-        subprocess.call([editor(), new_sheet_path])
-
-    except OSError:
-        die('Could not launch ' + editor())
+    open_with_editor(new_sheet_path)
 
 
 def edit(sheet):
     """ Opens a cheatsheet for editing """
-
-    try:
-        subprocess.call([editor(), path(sheet)])
-
-    except OSError:
-        die('Could not launch ' + editor())
+    open_with_editor(path(sheet))
 
 
 def exists(sheet):
@@ -81,7 +71,52 @@ def path(sheet):
 def read(sheet):
     """ Returns the contents of the cheatsheet as a String """
     if not exists(sheet):
-        die('No cheatsheet found for ' + sheet)
+        die('\033[1;31mNo\033[0m cheatsheet found for \033[1;31m' + sheet + '\033[0m')
 
     with open(path(sheet)) as cheatfile:
         return cheatfile.read()
+
+def remove(sheet, default="yes"):
+    """Ask a yes/no/quit sheet via raw_input() and return their answer.
+
+    "sheet" is a string that is presented to the user.
+    "default" is the presumed answer if the user just hits <Enter>.
+        It must be "yes" (the default), "no", "quit" or None (meaning
+        an answer is required of the user).
+    The "answer" return value is one of "yes", "no" or "quit".
+    """
+
+    if not exists(sheet):
+        die('\033[1;31mNo\033[0m cheatsheet found for \033[1;31m' + sheet + '\033[0m')
+
+    sheet = sheets.get()[sheet]
+
+    valid = {"yes":"yes",   "y":"yes",    "ye":"yes",
+             "no":"no",     "n":"no",
+             "quit":"quit", "qui":"quit", "qu":"quit", "q":"quit"}
+    if default == None:
+        prompt = " [y/n/q] "
+    elif default == "yes":
+        prompt = " [Y/n/q] "
+    elif default == "no":
+        prompt = " [y/N/q] "
+    elif default == "quit":
+        prompt = " [y/n/Q] "
+    else:
+        raise ValueError("invalid default answer: '%s'" % default)
+    while 1:
+        sys.stdout.write(sheet + prompt)
+        choice = input().lower()
+        if default is not None and choice == '':
+            print("Delete\033[1;31m %s \033[0mfile " % sheet)
+            os.remove(sheet)
+            return default
+        elif choice in valid.keys():
+            print("Delete\033[1;31m %s \033[0mfile " % sheet)
+            os.remove(sheet)
+            return valid[choice]
+        else:
+            sys.stdout.write("Please respond with 'yes', 'no' or 'quit'.\n")
+
+
+

cheat/sheets.py

@@ -7,7 +7,8 @@ def default_path():
     """ Returns the default cheatsheet path """
 
     # determine the default cheatsheet dir
-    default_sheets_dir = os.environ.get('DEFAULT_CHEAT_DIR') or os.path.join(os.path.expanduser('~'), '.cheat')
+    default_sheets_dir = os.environ.get('DEFAULT_CHEAT_DIR') or os.path.join('~', '.cheat')
+    default_sheets_dir = os.path.expanduser(os.path.expandvars(default_sheets_dir))
 
     # create the DEFAULT_CHEAT_DIR if it does not exist
     if not os.path.isdir(default_sheets_dir):
@@ -35,14 +36,22 @@ def get():
 
     # otherwise, scan the filesystem
     for cheat_dir in reversed(paths()):
-        cheats.update(
-            dict([
-                (cheat, os.path.join(cheat_dir, cheat))
-                for cheat in os.listdir(cheat_dir)
-                if not cheat.startswith('.')
-                and not cheat.startswith('__')
-            ])
-        )
+        subdirs = []
+        for root, dirs, files in os.walk(cheat_dir, topdown=True):
+            dirs[:] = [d for d in dirs if not d.startswith('.')]
+            subdirs.append(root)
+
+        for subdir in subdirs:
+            cheats.update(
+                dict([
+                    (cheat, os.path.join(subdir, cheat))
+                    for cheat in os.listdir(subdir)
+                    if not cheat.startswith('.')
+                    and not cheat.startswith('__')
+                    and not os.path.isdir(os.path.join(subdir, cheat))
+                ])
+            )
+
 
     return cheats
 
@@ -75,15 +84,21 @@ def list():
     return sheet_list
 
 
-def search(term):
-    """ Searches all cheatsheets for the specified term """
+def search(term, target_sheet):
+    """ Searches all cheatsheets for the specified term.
+        Restrict search to target_sheet if given """
     result = ''
-
     for cheatsheet in sorted(get().items()):
+        if target_sheet and target_sheet != cheatsheet[0]:
+            continue
         match = ''
-        for line in open(cheatsheet[1]):
+#        for line in open(cheatsheet[1]):
+        for index, line in enumerate(open(cheatsheet[1])):
             if term in line:
-                match += '  ' + line
+                 match += '[%d]\t\t' % index + line.strip() + '\n'
+#                if 'CHEATCOLORS' in os.environ:
+#                    line = line.replace(term, '\033[1;31m'+ term +'\033[0m');
+#                match += '  ' + line
 
         if match != '':
             result += cheatsheet[0] + ":\n" + match + "\n"

cheat/utils.py

@@ -1,6 +1,7 @@
 from __future__ import print_function
 import os
 import sys
+import subprocess
 
 
 def colorize(sheet_content):
@@ -12,14 +13,29 @@ def colorize(sheet_content):
 
     try:
         from pygments import highlight
-        from pygments.lexers import BashLexer
+        from pygments.lexers import get_lexer_by_name
         from pygments.formatters import TerminalFormatter
 
     # if pygments can't load, just return the uncolorized text
     except ImportError:
         return sheet_content
 
-    return highlight(sheet_content, BashLexer(), TerminalFormatter())
+    # GMFTBY add
+    if sheet_content == '' :
+        # can not find the content about the term
+        die('Can not find the content !')
+        return
+
+    first_line = sheet_content.splitlines()[0]
+    lexer      = get_lexer_by_name('bash')
+    if first_line.startswith('```'):
+        sheet_content = '\n'.join(sheet_content.split('\n')[1:-2])
+        try:
+            lexer = get_lexer_by_name(first_line[3:])
+        except Exception:
+            pass
+
+    return highlight(sheet_content, lexer, TerminalFormatter())
 
 
 def die(message):
@@ -30,20 +46,31 @@ def die(message):
 
 def editor():
     """ Determines the user's preferred editor """
-    if 'EDITOR' not in os.environ:
+
+    # determine which editor to use
+    editor = os.environ.get('CHEAT_EDITOR') \
+        or os.environ.get('VISUAL')         \
+        or os.environ.get('EDITOR')         \
+        or False
+
+    # assert that the editor is set
+    if editor == False:
         die(
-            'In order to create/edit a cheatsheet you must set your EDITOR '
-            'environment variable to your editor\'s path.'
+            'You must set a CHEAT_EDITOR, VISUAL, or EDITOR environment '
+            'variable in order to create/edit a cheatsheet.'
         )
 
-    elif os.environ['EDITOR'] == "":
-        die(
-            'Your EDITOR environment variable is set to an empty string. It must '
-            'be set to your editor\'s path.'
-        )
+    return editor
+
+
+def open_with_editor(filepath):
+    """ Open `filepath` using the EDITOR specified by the environment variables """
+    editor_cmd = editor().split()
+    try:
+        subprocess.call(editor_cmd + [filepath])
+    except OSError:
+        die('Could not launch ' + editor())
 
-    else:
-        return os.environ['EDITOR']
 
 def warn(message):
     """ Prints a message to stderr """

setup.py

@@ -3,11 +3,11 @@ import os
 
 setup(
     name         = 'cheat',
-    version      = '2.1.26',
+    version      = '2.2.32',
     author       = 'Chris Lane',
     author_email = 'chris@chris-allen-lane.com',
     license      = 'GPL3',
-    description  = 'cheat allows you to create and view interactive cheatsheets '
+    description  = 'Custom cheat by e32 - cheat allows you to create and view interactive cheatsheets '
     'on the command-line. It was designed to help remind *nix system '
     'administrators of options for commands that they use frequently, but not '
     'frequently enough to remember.',