Merge branch 'master' of https://github.com/chrisallenlane/cheat

Conflicts:
	setup.py

README.md

@@ -104,6 +104,13 @@ enable this feature, set a `CHEATCOLORS` environment variable:
 
     export CHEATCOLORS=true
 
+### Enabling Command-line Autocompletion ###
+The `cheat/autocompletion` directory contains scripts to enable command-line
+autocompletion for various shells. To activate autocompletion, simply copy the
+appropriate script to the appropriate path on your system. (The "appropriate
+path" will vary on a per-platform basis, so this documentation shall not
+speculate as to where that may be.)
+
 
 Related Projects
 ----------------

bin/cheat

@@ -38,7 +38,7 @@ from docopt import docopt
 
 if __name__ == '__main__':
     # parse the command-line options
-    options = docopt(__doc__, version='cheat 2.0.5')
+    options = docopt(__doc__, version='cheat 2.0.7')
 
     # list directories
     if options['--directories']:

cheat/__init__.py

@@ -1,3 +1,3 @@
-import sheet
+from . import sheet
-import sheets
+from . import sheets
-import utils
+from . import utils

setup.py

@@ -44,19 +44,9 @@ class my_install_scripts(install_scripts):
             with open(bat_file, 'wt') as fobj:
                 fobj.write(bat_contents)
 
-
-data = [
-         ('/usr/share/zsh/site-functions', ['cheat/autocompletion/_cheat.zsh']),
-         ('/etc/bash_completion.d'       , ['cheat/autocompletion/cheat.bash']),
-         ('/usr/share/fish/completions'  , ['cheat/autocompletion/cheat.fish'])
-       ]
-
-if os.name == 'nt':
-    data = []
-
 setup(
     name         = 'cheat',
-    version      = '2.0.5',
+    version      = '2.0.7',
     author       = 'Chris Lane',
     author_email = 'chris@chris-allen-lane.com',
     license      = 'GPL3',
@@ -74,7 +64,6 @@ setup(
         'cheat.cheatsheets': [f for f in os.listdir('cheat/cheatsheets') if '.' not in f]
     },
     scripts          = ['bin/cheat'],
-    data_files   = data,
     install_requires = [
         'docopt >= 0.6.1',
         'pygments >= 1.6.0',