1
0
Fork 0

Autocommitted updated scripts from mari-wovn

main
Mari 5 years ago
parent 0401dcb2c6
commit e1c394df32
  1. 2
      .gitmodules
  2. 24
      per-host/mari-wovn/.bash_aliases
  3. 0
      vim/bundle/ale
  4. 3
      vimrc

2
.gitmodules vendored

@ -14,5 +14,5 @@
path = git-aware-prompt path = git-aware-prompt
url = https://github.com/jimeh/git-aware-prompt.git url = https://github.com/jimeh/git-aware-prompt.git
[submodule "vim/ale"] [submodule "vim/ale"]
path = vim/ale path = vim/bundle/ale
url = https://github.com/dense-analysis/ale.git url = https://github.com/dense-analysis/ale.git

@ -14,7 +14,7 @@ function wovn_start() {
set -o pipefail set -o pipefail
branch=${1:?} branch=${1:?}
branch=${branch#feature/} branch=${branch#feature/}
tmux -2 new-window -t "Main Screen" -n "$branch" -c ~/branches -e BRANCH_NAME="$branch" 'bash -ic "_start_branch \"\$BRANCH_NAME\"; exec bash"' tmux -2 new-window -t "Main Screen" -n "$branch" -c ~/equalizer -e BRANCH_NAME="$branch" 'bash -ic "_start_branch \"\$BRANCH_NAME\"; exec bash"'
) )
} }
@ -25,23 +25,23 @@ function _start_branch() {
# set -o errexit # Can't do this inside a function # set -o errexit # Can't do this inside a function
set -o nounset set -o nounset
set -o pipefail set -o pipefail
if [[ ! -d ~/branches/"$branch" ]]; then if [[ ! -d ~/equalizer/"$branch" ]]; then
printf "=== Setting up a branch named ${branch}...\n" printf "=== Setting up a branch named ${branch}...\n"
cd ~/equalizer.git || exit "$?" cd ~/equalizer/master || exit "$?"
wovn_pull wovn_pull
printf "=== Checking out the branch named feature/${branch} in a new working tree at ~/branches/${branch}...\n" printf "=== Checking out the branch named feature/${branch} in a new working tree at ~/equalizer/${branch}...\n"
git worktree add -b "feature/${branch}" ~/branches/"${branch}" develop_front || git worktree add ~/branches/"${branch}" "feature/${branch}" || exit "$?" git worktree add -b "feature/${branch}" ../"${branch}" develop_front || git worktree add ../"${branch}" "feature/${branch}" || exit "$?"
else else
printf "=== Accessing an existing branch named ${branch}...\n" printf "=== Accessing an existing branch named ${branch}...\n"
fi fi
cd ~/branches/"${branch}" || exit "$?" cd ~/equalizer/"${branch}" || exit "$?"
wovn_update || exit "$?" wovn_update || exit "$?"
printf "\a=== Your branch ${branch} is ready!\n" printf "\a=== Your branch ${branch} is ready!\n"
) )
if [[ -d ~/branches/"$branch" ]]; then if [[ -d ~/equalizer/"$branch" ]]; then
cd ~/branches/"${branch}" cd ~/equalizer/"${branch}"
else else
cd ~/equalizer.git cd ~/equalizer/
fi fi
} }
@ -56,11 +56,11 @@ function get_remote_branch_name() {
function wovn_pull() { function wovn_pull() {
( (
printf "=== Retrieving the latest data from the repository...\n" printf "=== Retrieving the latest data from the repository...\n"
cd ~/branches/master || exit "$?" cd ~/equalizer/master || exit "$?"
git pull || exit "$?" git pull || exit "$?"
cd ~/branches/develop || exit "$?" cd ~/equalizer/develop || exit "$?"
git pull || exit "$?" git pull || exit "$?"
cd ~/branches/develop_front || exit "$?" cd ~/equalizer/develop_front || exit "$?"
git pull || exit "$?" git pull || exit "$?"
) )
} }

@ -30,6 +30,9 @@ let g:ale_fixers = {'javascript': ['standard']}
let g:ale_lint_on_save = 1 let g:ale_lint_on_save = 1
let g:ale_fix_on_save = 1 let g:ale_fix_on_save = 1
let g:ale_sign_column_always = 1 let g:ale_sign_column_always = 1
let g:airline#extensions#ale#enabled = 1
hi ALEError ctermbg=DarkRed ctermfg=White
hi ALEWarning ctermbg=106 ctermfg=Black
let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#enabled = 1
set modeline set modeline

Loading…
Cancel
Save