Compare commits

..

5 Commits
2.0.1 ... 2.0.3

Author SHA1 Message Date
f128167311 Version bump 2014-05-25 19:47:08 -04:00
74a91aa1d4 Merge branch 'windows_setup' of github.com:chid/cheat into chid-windows_setup
* 'windows_setup' of github.com:chid/cheat:
  fix setup for Windows
2014-05-25 19:45:24 -04:00
f0cbc2df7b Version bump 2014-05-25 19:41:45 -04:00
377da479e6 fix setup for Windows 2014-05-24 16:29:40 +10:00
2f56270ded Fix geteuid not existing on Windows 2014-05-24 16:16:59 +10:00
3 changed files with 13 additions and 8 deletions

View File

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

View File

@ -9,7 +9,7 @@ def default_path():
# the default path becomes confused when cheat is run as root, so fail
# under those circumstances. (There is no good reason to need to run cheat
# as root.)
if os.geteuid() == 0:
if os.name != 'nt' and os.geteuid() == 0:
die('Please do not run this application as root.');
# determine the default cheatsheet dir

View File

@ -1,9 +1,18 @@
from distutils.core import setup
import os
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.1',
version = '2.0.3',
author = 'Chris Lane',
author_email = 'chris@chris-allen-lane.com',
license = 'GPL3',
@ -21,11 +30,7 @@ setup(
'cheat.cheatsheets': [f for f in os.listdir('cheat/cheatsheets') if '.' not in f]
},
scripts = ['bin/cheat'],
data_files = [
('/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'])
],
data_files = data,
install_requires = [
'docopt >= 0.6.1',
'pygments >= 1.6.0',