Update
This commit is contained in:
parent
94f6b92dab
commit
e6f30324a5
|
@ -14,9 +14,6 @@ export PROJECTS=$HOME/Code
|
|||
# Go
|
||||
# export GOROOT=$HOME/go/lang
|
||||
export GOPATH=$HOME/go/path
|
||||
# export CGO_ENABLED=0
|
||||
|
||||
# Bash stuff
|
||||
|
||||
function __bash_import { source $HOME/.bash/$1.bash; }
|
||||
__bash_import "functions_internal"
|
||||
|
@ -29,9 +26,8 @@ __bash_import "prompt"
|
|||
__bash_import "functions"
|
||||
__bash_import "docker"
|
||||
__bash_import "secrets"
|
||||
# __bash_import "homebrew_completions"
|
||||
|
||||
|
||||
# Homebrew bash completions
|
||||
if [ -f $(brew --prefix)/etc/bash_completion ]; then
|
||||
. $(brew --prefix)/etc/bash_completion
|
||||
fi
|
||||
|
|
|
@ -2,10 +2,6 @@ function reload {
|
|||
source $HOME/.bash_profile
|
||||
}
|
||||
|
||||
function psg {
|
||||
ps aux | head -n1
|
||||
ps aux | grep $1 | grep -v grep
|
||||
}
|
||||
function ssh {
|
||||
# Change tab title
|
||||
local host=$(echo $1 | cut -d@ -f1)
|
||||
|
|
16
bin/git-up
16
bin/git-up
|
@ -41,12 +41,12 @@ exit if conflict
|
|||
system 'bundle' if files.keys.include?('Gemfile.lock')
|
||||
|
||||
# Migrating if schema has changed
|
||||
if files.keys.include?('db/schema.rb')
|
||||
system 'bundle exec rake db:migrate'
|
||||
system 'git checkout db/schema.rb' # Reseting schema
|
||||
end
|
||||
# if files.keys.include?('db/schema.rb')
|
||||
# system 'bundle exec rake db:migrate'
|
||||
# system 'git checkout db/schema.rb' # Reseting schema
|
||||
# end
|
||||
|
||||
if files.keys.grep(/^app\/assets/).length > 0
|
||||
puts 'Compiling assets...'
|
||||
system 'bundle exec rake assets:precompile > /dev/null 2>&1'
|
||||
end
|
||||
# if files.keys.grep(/^app\/assets/).length > 0
|
||||
# puts 'Compiling assets...'
|
||||
# system 'bundle exec rake assets:precompile > /dev/null 2>&1'
|
||||
# end
|
||||
|
|
Loading…
Reference in New Issue