From e5bf9146fe43a2669ade18605b71bcb66ab26b0f Mon Sep 17 00:00:00 2001 From: shanahanjrs Date: Tue, 12 Sep 2017 23:11:38 -0400 Subject: [PATCH] Fixed cheat sheets to conform to the standard style more closely --- cheat/cheatsheets/alias | 12 +++--------- cheat/cheatsheets/cat | 16 +++++++--------- cheat/cheatsheets/cp | 20 +++++++------------- cheat/cheatsheets/export | 6 +++--- cheat/cheatsheets/kill | 10 ++++------ cheat/cheatsheets/mv | 19 +++++++++++++------ cheat/cheatsheets/pwd | 3 +-- cheat/cheatsheets/wc | 23 +++++++++++++++++------ 8 files changed, 55 insertions(+), 54 deletions(-) diff --git a/cheat/cheatsheets/alias b/cheat/cheatsheets/alias index f9c515a..9bd98c1 100644 --- a/cheat/cheatsheets/alias +++ b/cheat/cheatsheets/alias @@ -1,11 +1,5 @@ -# alias - Creates an alias of a command -*Stick these in your .bashrc/.bash_profile for permenant use, otherwise lost on re-entry +# 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' -alias lll='ls -al' -alias vi='vim' -alias ..='cd ..' -alias c='clear' -alias rkhunter='rkhunter --versioncheck --update --autox --skip-keypress --check' - -Running just `alias' will show your current aliases. diff --git a/cheat/cheatsheets/cat b/cheat/cheatsheets/cat index c80b75f..69a25d0 100644 --- a/cheat/cheatsheets/cat +++ b/cheat/cheatsheets/cat @@ -1,10 +1,8 @@ -# cat - concatenate and print files -cat [-benstuv] [filename] +# Display the contents of a file +cat /path/to/foo --b : Number non blank lines (1 indexed) --e : Display non printing chars --n : Number output (1 indexed) --s : Single spaced output --t : Display non printing chars (Tab as `^I') --u : Disable output buffering --v : Display all non printing chars no matter what +# Display contents with line numbers +cat -n /path/to/foo + +# Display contents with line numbers (blank lines excluded) +cat -b /path/to/foo diff --git a/cheat/cheatsheets/cp b/cheat/cheatsheets/cp index f1de317..3c0e246 100644 --- a/cheat/cheatsheets/cp +++ b/cheat/cheatsheets/cp @@ -1,14 +1,8 @@ -# cp - copy. Copies a file or directory -cp [-a, -f, -H, -i, -L, -n, -p, -P, -R, -X] [-v] [source] [target] +# Create a copy of a file +cp ~/Desktop/foo.txt ~/Downloads/foo.txt --a : Same as -pPR --f : Force --H : Follow sym links --i : Prompt before overwrite --L : If -R, follow sym links --n : Do not overwrite --P : If -R, Do not follow sym links (Default) --p : Preserve meta data --R : Recursive (cp directories) --X : Do not copy extended attributes or resource forks --v : Verbose +# 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 diff --git a/cheat/cheatsheets/export b/cheat/cheatsheets/export index 34223a0..14d3d71 100644 --- a/cheat/cheatsheets/export +++ b/cheat/cheatsheets/export @@ -1,5 +1,5 @@ -# Export makes a variable something that will be included in child process environments -export VARNAME="value" - # Calling export with no arguments will show current shell attributes export + +# Create new environment variable +export VARNAME="value" diff --git a/cheat/cheatsheets/kill b/cheat/cheatsheets/kill index 836c8ec..d80510e 100644 --- a/cheat/cheatsheets/kill +++ b/cheat/cheatsheets/kill @@ -1,7 +1,5 @@ -# kill - Kills a process +# Kill a process gracefully +kill -15 -# Kill gracefully -kill -15 [PID] - -# Force kill (*Only use if -15 does not work first, this is dirty*) -kill -9 [PID] +# Kill a process forcefully +kill -9 diff --git a/cheat/cheatsheets/mv b/cheat/cheatsheets/mv index c31de4c..a3f5f19 100644 --- a/cheat/cheatsheets/mv +++ b/cheat/cheatsheets/mv @@ -1,7 +1,14 @@ -# mv - move. Moves a file or directory -mv [-f, -i, -n] [-v] [source] [target] +# Move a file from one place to another +mv ~/Desktop/foo.txt ~/Documents/foo.txt --f : No prompt before overwriting something in target destination. Overrides any previous -i or -n args. --i : Prompt before overwriting something. Overrides any previous -f or -n args. --n : Do not overwrite anything. Overrides any previous -f or -i args. --v : Verbose +# 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 diff --git a/cheat/cheatsheets/pwd b/cheat/cheatsheets/pwd index ab7f8fb..f672c88 100644 --- a/cheat/cheatsheets/pwd +++ b/cheat/cheatsheets/pwd @@ -1,3 +1,2 @@ -# Print Working Directory -# The `pwd' command will show you the absolute path of your current directory on the filesystem +# Show the absolute path of your current working directory on the filesystem pwd diff --git a/cheat/cheatsheets/wc b/cheat/cheatsheets/wc index 99c3fa9..c8d771e 100644 --- a/cheat/cheatsheets/wc +++ b/cheat/cheatsheets/wc @@ -1,7 +1,18 @@ -# wc - word count (or lines, characters, or bytes) -wc [-clmw] [output] +# Count the number of words (file or STDIN) +wc -w /path/to/foo.txt +cat /path/to/foo.txt | wc -w --c : Number of bytes (cancels -m opt) --l : Number of lines --m : Number of characters (cancels -c opt) --w : Number of words +# 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