FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.
The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.
| launch=pipe | |
| pipe-command=/path/to/xipio-pipe.rb | |
| pipe-timeout=200 | |
| pipe-regex=^.*.ip.ipq.co;.*$ |
| #!/bin/bash | |
| for file in *.jpg | |
| do | |
| sips --resampleHeightWidthMax 1357 --setProperty formatOptions 80 $file | |
| done; |
#Javascript Rss Reader#
Takes a rss feed and prints html (defined by a template) for every post.
| bash -c ' | |
| <%= "export http_proxy=\"#{knife_config[:bootstrap_proxy]}\"" if knife_config[:bootstrap_proxy] -%> | |
| if [ ! -f /usr/bin/chef-client ]; then | |
| apt-get update | |
| apt-get install -y libreadline5 libruby1.9.1 ruby1.9.1 ruby1.9.1-dev build-essential wget rubygems1.9.1 | |
| fi | |
| LC_CTYPE=en_US.UTF-8 LANG=en_US.UTF-8 export LC_CTYPE LANG |
| # config/initializers/redcarpet.rb | |
| module ActionView | |
| module Template::Handlers | |
| class Markdown | |
| class_attribute :default_format | |
| self.default_format = Mime::HTML | |
| def call(template) | |
| markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true) | |
| markdown.render(template.source).html_safe.inspect |
| #!/bin/sh | |
| ### | |
| # SOME COMMANDS WILL NOT WORK ON macOS (Sierra or newer) | |
| # For Sierra or newer, see https://github.com/mathiasbynens/dotfiles/blob/master/.macos | |
| ### | |
| # Alot of these configs have been taken from the various places | |
| # on the web, most from here | |
| # https://github.com/mathiasbynens/dotfiles/blob/5b3c8418ed42d93af2e647dc9d122f25cc034871/.osx |
| require 'chef/mixin/shell_out' | |
| require 'chef/platform' | |
| require 'chef' | |
| include Chef::Mixin::ShellOut | |
| class Chef | |
| class Provider | |
| class Package | |
| class Pkgng < Chef::Provider::Package |
| # How to Install RVM, Ruby, and Gems without Xcode Command Line Tools | |
| # =================================================================== | |
| # | |
| # Mac OS X 10.8.2 (12C60) (Mountain Lion) | |
| # Xcode 4.5 (4G182) | |
| # | |
| # While attempting to `rvm pkg install openssl`, I had encountered the error: | |
| # > cryptlib.h:62:20: error: stdlib.h: No such file or directory | |
| # But, the commands & ouput below show how I worked around the issue. | |
| # |
