From e6f30324a5a69324197a01d4cf18659cfa05b30b Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Thu, 10 Oct 2019 00:53:16 +0200 Subject: [PATCH] Update --- bash/bashrc.bash | 6 +----- bash/functions.bash | 4 ---- bin/git-up | 16 ++++++++-------- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/bash/bashrc.bash b/bash/bashrc.bash index 75c5641..5a09bb8 100644 --- a/bash/bashrc.bash +++ b/bash/bashrc.bash @@ -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 diff --git a/bash/functions.bash b/bash/functions.bash index 9347be5..e306f1e 100644 --- a/bash/functions.bash +++ b/bash/functions.bash @@ -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) diff --git a/bin/git-up b/bin/git-up index c105b3b..0bdc464 100755 --- a/bin/git-up +++ b/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