wayneeseguin

if [[ -s /home/somms/.rvm/scripts/rvm ]] ; then source /home/somms/.rvm/scripts/rvm ; fi

wayneeseguin

# ~/.bashrc: executed by bash(1) for non-login shells.

export PS1='\h:\w\$ '
umask 022

# You may uncomment the following lines if you want `ls' to be colorized:
# export LS_OPTIONS='--color=auto'
# eval "`dircolors`"
# alias ls='ls $LS_OPTIONS'
# alias ll='ls $LS_OPTIONS -l'

wayneeseguin

#!/bin/bash

# Merge conflict check.
if grep -iR "<<<<<<" ./* || grep -iR ">>>>>" ./* ; then 
  echo "\nERROR:\nYou have merge conflicts. \nPlease resolve them and try again.\n"
  exit 1
fi

wayneeseguin

# Correct

My .bash_profile:::
<< Heap of stuff from default ubuntu install that was under the &&return line>>

# Be sure all paths / environment setup before sourcing RVM
#RVM
if [[ -s /home/steve/.rvm/scripts/rvm ]]; then
  source /home/steve/.rvm/scripts/rvm ;

wayneeseguin

# Final Countdown
# config.middleware.use Roll
class Roll
  def initialize(app)
    @app = app
  end
  
  def call(env)
    request = Rack::Request.new(env)
    ip = request.ip

wayneeseguin

# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples

if [[ ! -z "$PS1" ]] ; then
  # don't put duplicate lines in the history. See bash(1) for more options
  # don't overwrite GNU Midnight Commander's setting of `ignorespace'.
  HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
  # ... or force ignoredups and ignorespace
  HISTCONTROL=ignoreboth

wayneeseguin

We couldn’t find that file to show.

wayneeseguin

# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples

# If not running interactively, don't do anything
if [[ ! -z "$PS1" ]] ; then
  # don't put duplicate lines in the history. See bash(1) for more options
  #export HISTCONTROL=ignoredups
  
  # check the window size after each command and, if necessary,

wayneeseguin

# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples

if [[ ! -z "$PS1" ]] ; then

  # don't put duplicate lines in the history. See bash(1) for more options
  # don't overwrite GNU Midnight Commander's setting of `ignorespace'.
  HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
  # ... or force ignoredups and ignorespace

wayneeseguin

# ~/.profile: executed by the command interpreter for login shells.
# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
# exists.
# see /usr/share/doc/bash/examples/startup-files for examples.
# the files are located in the bash-doc package.

# the default umask is set in /etc/profile; for setting the umask
# for ssh logins, install and configure the libpam-umask package.
#umask 022
# set PATH so it includes user's private bin if it exists