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

Author: chubin

lib/adapter/cmd.py

@@ -54,7 +54,7 @@ def _get_list(self, prefix=None):
         return _get_filenames(PATH_CHEAT_PAGES)
 
     def _get_page(self, topic, request_options=None):
-        cmd = ["cheat", topic]
+        cmd = ["/usr/local/bin/cheat", topic]
         proc = Popen(cmd, stdout=PIPE, stderr=PIPE)
         answer = proc.communicate()[0].decode('utf-8')
         return answer

lib/frontend/ansi.py

@@ -28,10 +28,10 @@
                                                             # pylint: disable=wrong-import-position
 sys.path.append(os.path.abspath(os.path.join(__file__, '..')))
 from globals import COLOR_STYLES
-import languages_data
-import beautifier                                           # pylint: enable=wrong-import-position
+import languages_data                                       # pylint: enable=wrong-import-position
 
 import fmt.internal
+import fmt.comments
 
 def visualize(answer_data, request_options):
     """
@@ -72,7 +72,7 @@ def _colorize_ansi_answer(topic, answer, color_style,       # pylint: disable=to
         highlight = lambda x: x
 
     if highlight_code:
-        blocks = beautifier.code_blocks(
+        blocks = fmt.comments.code_blocks(
             answer, wrap_lines=True, unindent_code=(4 if unindent_code else False))
         highlighted_blocks = []
         for block in blocks:

lib/globals.py

@@ -34,7 +34,7 @@
 
 if USE_OS_PACKAGES:
     PATH_TLDR_PAGES = "/home/igor/.tldr/cache/pages/*/*.md"
-    PATH_CHEAT_PAGES = "/usr/local/lib/python2.7/dist-packages/cheat/cheatsheets/*"
+    PATH_CHEAT_PAGES = "/usr/share/cheat/*"
     PATH_CHEAT_SHEETS = "/home/igor/cheat.sheets/sheets/"
     PATH_CHEAT_SHEETS_SPOOL = "/home/igor/cheat.sheets/spool/"
     PATH_LEARNXINY = "/home/igor/git/github.com/adambard/learnxinyminutes-docs"