Commit Graph

78 Commits

Author SHA1 Message Date
Chris Lane
fabd1bc242 Resolved a trivial merge conflcit in cheatsheets/sed. Resolved major merge conflict in ./cheat. Made very minor revision to @larsyencken's patch to prevent __init__.py/c files from being listed as cheatsheets. 2013-08-21 22:49:07 -04:00
Chris Lane
6d456d147d Merge pull request #25 from adelviscio/patch-1
Added global flag, replaced redundant redirection.
2013-08-21 19:32:48 -07:00
Chris Lane
07c49e8540 Minor tweak to @smartboyathome's patch. 2013-08-21 22:28:28 -04:00
Chris Lane
2b9d48c8c4 Merge branch 'master' of https://github.com/smartboyathome/cheat into smartboyathome-master
* 'master' of https://github.com/smartboyathome/cheat:
  Making the default cheats directory Windows-compatible.
2013-08-21 22:24:56 -04:00
Chris Lane
031eeb6a96 Restored the __init__.py file that I stupidly deleted on a previous commit. 2013-08-21 22:17:29 -04:00
Lars Yencken
8245d3f4ec Explicitly mark comment lines in builtin sheets. 2013-08-22 11:34:11 +10:00
Lars Yencken
f89d887c21 Add a check for posix environment for pygments. 2013-08-22 09:19:31 +10:00
Lars Yencken
39a15a669a Make Pygments a soft dependency. 2013-08-21 19:33:09 +10:00
Lars Yencken
c6bb350a13 Colorize output using Pygment lexers. 2013-08-21 17:05:52 +10:00
Lars Yencken
17b2148d6e Reformat to meet PEP8 style. 2013-08-21 16:46:10 +10:00
Lars Yencken
9140d2ebfb Allow suffixes for cheat files (e.g. DataFrames.jl). 2013-08-21 16:35:39 +10:00
Anthony Delviscio
e6e4b1e420 Added global flag, replaced redundant redirection.
Not using the 'g' (global) flag only replaces the first match on a line.  The 'g' flag will replace all matches.
2013-08-21 00:17:52 -04:00
Alex Abbott
b188629b92 Making the default cheats directory Windows-compatible. 2013-08-20 14:56:12 -07:00
Chris Lane
1e26280da7 Added some comments to the cheat file. 2013-08-19 21:35:51 -04:00
Chris Lane
f3c37a37eb Added an openssl cheatsheet. 2013-08-19 21:31:34 -04:00
Chris Lane
e3d6976a03 Merging. 2013-08-19 21:15:02 -04:00
Chris Lane
dc754295ac Merge pull request #19 from shanahanjrs/master
Changed lines so none were over 80 columns.
2013-08-19 18:08:29 -07:00
John Shanahan
01b35ab0b7 Added main function and wrapped everything in it. 2013-08-19 15:23:53 -04:00
Louis Taylor
570d05349e No breakage when cheatsheets package isn't found
This means cheat can be installed in only the home directory again.
2013-08-19 09:02:53 +01:00
Louis Taylor
6627b06b1d Add gitignore
Ignores python bytecode files and the build directory created by distutils.
2013-08-19 08:50:40 +01:00
Louis Taylor
16537467f1 Remove python bytecode file 2013-08-19 08:49:09 +01:00
John Shanahan
84f3105139 Changed lines so none were over 80 columns. 2013-08-18 22:52:35 -04:00
Chris Lane
26e5261713 Did a refactoring to incorporate kragniz's work a little more delicately. 2013-08-18 15:53:40 -04:00
Chris Lane
54f379eda5 Fixed a bug whereby the 'cheatsheet not found' error would always be displayed. 2013-08-18 15:14:19 -04:00
Chris Lane
dbfce8cbd4 Merging new cheatsheets into kragniz's work. 2013-08-18 14:59:49 -04:00
Chris Lane
bef2b22ad6 Merge branch 'master' of https://github.com/kragniz/cheat into kragniz-master
* 'master' of https://github.com/kragniz/cheat:
  Don't split cheatpath for no reason
  Remove duplicates from the list of cheatsheets.
  Change indent level from 2 spaces to 4.
  Change most of the headers to h1's.
  Add a non-root section to the installation guide.
  Don't require the package to be available.
  Remove old install script
  Replace support for user's .cheat directories
  Update readme with setup.py
  Package with distutils
2013-08-18 14:57:55 -04:00
Louis Taylor
9946bab1a9 Don't split cheatpath for no reason 2013-08-18 17:41:32 +01:00
Chris Lane
e105102bb8 Merge pull request #13 from smlance/scp
Added base scp file.
2013-08-18 08:01:36 -07:00
Chris Lane
191949b45a Merge pull request #16 from Simnol/master
Added 'asterisk' and minor update to 'tar'
2013-08-18 07:59:54 -07:00
Simnol
c78dc1a236 Update asterisk
Added what 'echo' does in originate command.
2013-08-18 15:34:07 +01:00
Simnol
3b44731819 Create asterisk
Added a few of the more basic commands for interacting with Asterisk from the shell, at the moment this does not cover actually being inside the Asterisk CLI.
2013-08-18 15:33:21 +01:00
Simnol
9be7d1f1a6 Update tar
Added 'To create an uncompressed archive:' for no other reason than it was missing and was annoying me.
2013-08-18 15:31:09 +01:00
Louis Taylor
cdf0aa1926 Remove duplicates from the list of cheatsheets. 2013-08-17 03:16:44 +01:00
Louis Taylor
73d9f0c83d Merge https://github.com/chrisallenlane/cheat
Conflicts:
	README.md
	cheat
	install
2013-08-17 02:38:31 +01:00
smlance
a4544a25b8 Added base scp file. 2013-08-16 11:09:58 -04:00
Louis Taylor
b38bbceb8a Change indent level from 2 spaces to 4. 2013-08-16 09:47:43 +01:00
Louis Taylor
f10c7fd19b Change most of the headers to h1's.
Makes the subheadings in the installation section look less strange.
2013-08-16 09:26:18 +01:00
Louis Taylor
1944c1a351 Add a non-root section to the installation guide. 2013-08-16 09:25:07 +01:00
Louis Taylor
63b0ffba14 Don't require the package to be available. 2013-08-16 03:02:33 +01:00
Chris Lane
6b8c516599 Fixing a minor typo in the REAMDE. 2013-08-15 18:55:59 -04:00
Chris Lane
07bd1953e7 More changes to the README. 2013-08-15 18:55:22 -04:00
Chris Lane
40d18e01dc Updated the README to document the usage of the $CHEATPATH environment variable. 2013-08-15 18:52:32 -04:00
Chris Lane
b8c42a1b64 Updated the README. 2013-08-15 18:38:13 -04:00
Chris Lane
13c8d60d75 Merging shanahanjrs work into master. 2013-08-15 18:19:02 -04:00
Chris Lane
10cb62fee9 Continuing to merge gbremer's work into master. 2013-08-15 18:03:58 -04:00
Chris Lane
db4f793da2 Merging gbremer's work into master. 2013-08-15 18:01:32 -04:00
John Shanahan
cc47515f41 Added '-help' and 'cheat' to the list of cheat usage arguments. 2013-08-15 17:49:30 -04:00
John Shanahan
7cf6291c8a Changed from 2-spaces per indentation level to 4, per PEP-8 standard. 2013-08-14 10:36:00 -04:00
John Shanahan
b6b416e7ce Added nmap support 2013-08-14 01:41:17 -04:00
Louis Taylor
389d6d5671 Remove old install script 2013-08-13 11:49:37 +01:00