Added completions for cat, cp, mktemp, stat, touch for OS X.

1 files changed, 42 insertions, 29 deletions

diff --git a/share/completions/cp.fish b/share/completions/cp.fish
index 61bcdee0..ca92194d 100644
--- a/share/completions/cp.fish
+++ b/share/completions/cp.fish
@@ -1,29 +1,42 @@
-
-complete -c cp -s a -l archive --description "Same as -dpR"
-complete -c cp -s b -l backup --description "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
-complete -c cp -l copy-contents --description "Copy contents of special files when recursive"
-complete -c cp -s d --description "Same as --no-dereference --preserve=link"
-complete -c cp -s f -l force --description "Do not prompt before overwriting"
-complete -c cp -s i -l interactive --description "Prompt before overwrite"
-complete -c cp -s H --description "Follow command-line symbolic links"
-complete -c cp -s l -l link --description "Link files instead of copying"
-complete -c cp -l strip-trailing-slashes --description "Remove trailing slashes from source"
-complete -c cp -s S -l suffix -r --description "Backup suffix"
-complete -c cp -s t -l target-directory --description "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
-complete -c cp -s u -l update --description "Do not overwrite newer files"
-complete -c cp -s v -l verbose --description "Verbose mode"
-complete -c cp -l help --description "Display help and exit"
-complete -c cp -l version --description "Display version and exit"
-complete -c cp -s L -l dereference --description "Always follow symbolic links"
-complete -c cp -s P -l no-dereference --description "Never follow symbolic links"
-complete -c cp -s p  --description "Same as --preserve=mode,ownership,timestamps"
-complete -c cp -f -l preserve --description "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
-complete -c cp -f -l no-preserve -r --description "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
-complete -c cp -l parents --description "Use full source file name under DIRECTORY"
-complete -c cp -s r -s R -l recursive --description "Copy directories recursively"
-complete -c cp -l remove-destination --description "First remove existing destination files"
-complete -c cp -f -l sparse -r --description "Control creation of sparse files" -xa "always auto never"
-complete -c cp -s s -l symbolic-link --description "Make symbolic links instead of copying"
-complete -c cp -s T -l no-target-directory --description "Treat DEST as a normal file"
-complete -c cp -s x -l one-file-system --description "Stay on this file system"
-complete -c cp -s X -l context -r --description "Set security context of copy to CONTEXT"
+if cp --version ^ /dev/null # GNU
+	complete -c cp -s a -l archive --description "Same as -dpR"
+	complete -c cp -s b -l backup --description "Make backup of each existing destination file" -a "none off numbered t existing nil simple never"
+	complete -c cp -l copy-contents --description "Copy contents of special files when recursive"
+	complete -c cp -s d --description "Same as --no-dereference --preserve=link"
+	complete -c cp -s f -l force --description "Do not prompt before overwriting"
+	complete -c cp -s i -l interactive --description "Prompt before overwrite"
+	complete -c cp -s H --description "Follow command-line symbolic links"
+	complete -c cp -s l -l link --description "Link files instead of copying"
+	complete -c cp -l strip-trailing-slashes --description "Remove trailing slashes from source"
+	complete -c cp -s S -l suffix -r --description "Backup suffix"
+	complete -c cp -s t -l target-directory --description "Target directory" -x -a "(__fish_complete_directories (commandline -ct) 'Target directory')"
+	complete -c cp -s u -l update --description "Do not overwrite newer files"
+	complete -c cp -s v -l verbose --description "Verbose mode"
+	complete -c cp -l help --description "Display help and exit"
+	complete -c cp -l version --description "Display version and exit"
+	complete -c cp -s L -l dereference --description "Always follow symbolic links"
+	complete -c cp -s P -l no-dereference --description "Never follow symbolic links"
+	complete -c cp -s p  --description "Same as --preserve=mode,ownership,timestamps"
+	complete -c cp -f -l preserve --description "Preserve ATTRIBUTES if possible" -xa "mode ownership timestamps links all"
+	complete -c cp -f -l no-preserve -r --description "Don't preserve ATTRIBUTES" -xa "mode ownership timestamps links all"
+	complete -c cp -l parents --description "Use full source file name under DIRECTORY"
+	complete -c cp -s r -s R -l recursive --description "Copy directories recursively"
+	complete -c cp -l remove-destination --description "First remove existing destination files"
+	complete -c cp -f -l sparse -r --description "Control creation of sparse files" -xa "always auto never"
+	complete -c cp -s s -l symbolic-link --description "Make symbolic links instead of copying"
+	complete -c cp -s T -l no-target-directory --description "Treat DEST as a normal file"
+	complete -c cp -s x -l one-file-system --description "Stay on this file system"
+	complete -c cp -s X -l context -r --description "Set security context of copy to CONTEXT"
+else # OS X
+	complete -c cp -s a --description "Preserve structure and attributes of files but not directory structure. (-pPR)"
+	complete -c cp -s f -d "Replace destination file without confirmation"
+	complete -c cp -s H -d "Follow symlinks on command-link"
+	complete -c cp -s i -d "Prompt before overwrite"
+	complete -c cp -s L -d "Follow all symlinks"
+	complete -c cp -s n -d "Do overwrite existing files"
+	complete -c cp -s P -d "Don't follow symlinks (default)"
+	complete -c cp -s p -d "Preserve attributes of source file"
+	complete -c cp -s R -d "Copy directories recursively"
+	complete -c cp -s v -d "Verbos output"
+	complete -c cp -s X -d "Do not copy Extended Attributes (EAs) of resource forks"
+end
\ No newline at end of file