Compare commits

...

48 Commits

Author SHA1 Message Date
934756ca7b Merge remote-tracking branch 'gitea/master' 2021-04-04 00:58:05 +01:00
Vahagn Khachatryan
23e9cd3444 bin/lusntag.socks5.sh and etc 2021-03-26 20:05:11 +00:00
Vahagn Khachatryan
2ce2aea94c fix git/hooks/commit-msg for merge. 2021-03-25 08:05:05 -04:00
5db2e777a4 backup also remote files. 2021-01-16 17:13:46 +00:00
7f99cc393a Merge branch 'master' of github.com:vishap/scripts 2021-01-16 15:18:31 +00:00
588a6ed9f4 vim/spell 2021-01-16 15:06:50 +00:00
6854f0f16b Updated backup script. 2021-01-08 00:45:33 +00:00
aac319d451 Merge branch 'master' of github.com:vishap/scripts 2020-12-28 01:51:59 +04:00
881fe061b9 upload.ready.deluge.sh no-progress 2020-12-28 01:51:45 +04:00
ec152c590e gitea docker-compose 2020-11-30 00:47:18 +00:00
b25a9090e1 nextcloud and gerbera docker-compose files. 2020-11-29 23:55:31 +00:00
Vahagn Khachatryan
3cff461799 Python venv added to .bashrc. 2020-09-25 05:01:04 -04:00
Vahagn Khachatryan
d54ce5b3c2 local/bb/.bashrc.local 2020-09-25 05:01:03 -04:00
Vahagn Khachatryan
9447f29865 Merge branch 'master' of github.com:vishap/scripts 2020-08-25 16:05:34 +01:00
cb27c91fc9 upload.ready.deluge.sh 2020-07-26 03:17:37 +04:00
Vahagn Khachatryan
d2636a0f94 Don't show my user name and command prompt. 2020-06-24 07:32:27 -04:00
Vahagn Khachatryan
faf4b6d3ed git install-hooks fix 2020-06-24 07:19:29 -04:00
Vahagn Khachatryan
268e368271 Using aspell for spell checking. 2020-06-24 07:17:37 -04:00
Vahagn Khachatryan
4e09a246af Vundle update. 2020-06-24 07:15:55 -04:00
Vahagn Khachatryan
d945cea0c3 git: setup-upstream script and refresh-master. 2020-06-22 15:14:04 -04:00
Vahagn Khachatryan
227c9d884b Got golden hooks. 2020-06-22 15:14:03 -04:00
root
8122906e08 Merge branch 'master' of github.com:vishap/scripts 2020-06-08 22:50:41 +01:00
6d1f23bda5 Merge branch 'master' of github.com:vishap/scripts 2020-04-14 00:34:14 +01:00
716ef8d098 docker compose for nextcloud 2020-04-14 00:33:49 +01:00
Vahagn Khachatryan
19af30bdc8 bbvpn bashrc.local 2020-04-05 23:02:54 +01:00
39c3b43ab7 Yerevak .ssh config. 2020-03-09 02:33:26 +04:00
Vahagn Khachatryan
11dfca106e Merge branch 'master' of github.com:vishap/scripts 2020-03-08 20:08:44 +00:00
98db749815 .ssh/config 2020-03-01 22:49:37 +00:00
e90b6dfede hrat.motd 2020-03-01 22:46:11 +00:00
93fec3e4b4 vimrc conflicts resolved. Vundle updated. 2020-03-01 22:44:58 +00:00
6833f5b5c9 docker files for calibre and gerbera. 2020-03-01 22:44:58 +00:00
Vahagn Khachatryan
bd5b1623ea bb vpn laptop wsl ssh config. 2020-03-01 19:15:19 +00:00
9eebd30038 lusntag.motd 2020-03-01 18:42:12 +00:00
6a676ba410 .ssh/config 2020-03-01 01:27:14 +00:00
d18052d793 yerevak.motd 2020-03-01 04:58:02 +04:00
52d2b83479 Update Vundle.vim 2020-03-01 04:10:39 +04:00
f4463206d5 Update upload.ready.deluge.sh; 2020-03-01 04:10:39 +04:00
4e7dc264d6 upload.ready.deluge.sh 2020-03-01 04:10:39 +04:00
35f225f9a4 lsync.sh fixed bug with doubling dir name. 2020-03-01 04:10:39 +04:00
f3cc45cc57 lsync.sh 2020-03-01 04:10:39 +04:00
Vahagn Khachatryan
5f8fe54a8f Fix BBTAG for whole session. 2020-02-28 05:57:38 -05:00
Vahagn Khachatryan
01e488783b Fix prompt errors on Solaris. 2020-02-28 05:55:45 -05:00
Vahagn Khachatryan
519c9e802d .gitconfig.locla 2020-02-24 22:02:59 +00:00
Vahagn Khachatryan
55db114d1f Merging with github.com. 2020-02-24 22:02:58 +00:00
Vahagn Khachatryan
243da630af bb setings. 2020-02-24 16:12:00 -05:00
Vahagn Khachatryan
fbd8aa8e74 bashrc: prompt revisited 2020-02-24 15:02:09 -05:00
Vahagn Khachatryan
2b4acf6e01 Merge branch 'master' of https://bitbucket.org/vishap/scripts 2019-11-25 06:33:20 -05:00
Vahagn Khachatryan
70dd0d162e Changing command prompt colors + git pager. 2019-11-25 06:07:21 -05:00
34 changed files with 848 additions and 96 deletions

View File

@@ -1,10 +1,12 @@
#!/bin/bash
#set -x
DATE=/bin/date
RSYNC=/usr/bin/rsync
TIMESTAMP=`$DATE +%Y%m%d-%H:%M%z`
LOGFILE=/mnt/hdd/backup/log/backup.mybook.public.$TIMESTAMP.log
LOGFILE=/mnt/hdd/backup/log/backup.$TIMESTAMP.log
LOG="/usr/bin/tee -a $LOGFILE"
function term() {
@@ -16,8 +18,24 @@ trap term INT
function backup() {
ORIG_DIR=$1
MIRROR_DIR=$2
shift 2
echo ""
echo "Sync $ORIG_DIR to $MIRROR_DIR"
$RSYNC -aXv --delete --force $ORIG_DIR $MIRROR_DIR | $LOG
echo "========================================================"
# Use --progress if interactive.
$RSYNC -aAXv --delete --force "$@" $ORIG_DIR $MIRROR_DIR 2>&1 | $LOG
if [ $? -ne 0 ]; then
echo "There were errors while backing up $ORIG_DIR"
fi
echo ""
}
function backuphdd() {
HDD_ORIG=/mnt/hdd
HDD_MIRROR=/mnt/hdd2
ORIG_DIR=$HDD_ORIG/$1
MIRROR_DIR=$HDD_MIRROR/$(dirname $1)
backup $ORIG_DIR $MIRROR_DIR
}
function backupwd() {
@@ -26,6 +44,18 @@ function backupwd() {
backup $ORIG_DIR $MIRROR_DIR
}
function backuplusntag() {
ORIG_DIR="vahagn@192.168.0.3:$1"
MIRROR_DIR=$2
backup $ORIG_DIR $MIRROR_DIR -e "ssh -i /home/vahagn/.ssh/id_rsa"
}
function backupyerevak() {
ORIG_DIR="vahagn@yerevak.vostan.org:$1"
MIRROR_DIR=$2
backup $ORIG_DIR $MIRROR_DIR -e "ssh -i /home/vahagn/.ssh/id_rsa -p 24"
}
#
# Log Header
@@ -35,16 +65,37 @@ echo start `$DATE` | $LOG
#
# Sync folders
#
backupwd "/srv/gitlab/" "backup/gitlab"
backupwd "/srv/nextcloud/" "backup/nextcloud"
backupwd "/mnt/hdd/public/_captured_MY_VIDEO/" "public/_captured_MY_VIDEO"
backupwd "/mnt/hdd/public/pix/" "public/pix"
backupwd "/mnt/hdd/public/music/" "public/music"
backupwd "/mnt/hdd/public/books/" "public/books"
backupwd "/mnt/hdd/vahagn/" "backup/vahagn"
backup "/srv/nextcloud" "/mnt/hdd/backup/docker"
backup "/var/lib/docker/volumes" "/mnt/hdd/backup/docker"
backup "/src/gerbera/music" "/mnt/hdd/public"
#backup "/srv/gitlab" "/mnt/hdd/backup/gitlab"
#backup "/srv/git" "/mnt/hdd/backup/git"
#
# Backup Lusntag
#
backuplusntag "/home/vahagn/msdos" "/mnt/hdd/backup"
backuplusntag "/home/vahagn/devel" "/mnt/hdd/backup/lusntag"
backuplusntag "/var/www" "/mnt/hdd/backup/lusntag"
backuplusntag "/etc/nginx" "/mnt/hdd/backup/lusntag/etc"
#
# Backup Yerevak
#
backupyerevak "/home/vahagn/devel" "/mnt/hdd/backup/yerevak"
#
# Backup hdd1 to hdd2
#
backuphdd "backup"
backuphdd "vahagn"
for i in $(ls /mnt/hdd/public); do
if [ $i != "movies" ]; then
backuphdd "public/$i"
fi
done
backup "/srv/gitlab" "/mnt/hdd/backup/gitlab"
backup "/srv/nextcloud" "/mnt/hdd/backup/nextcloud"
#
# Log Footer
#

8
bin/docker-calibre.sh Executable file
View File

@@ -0,0 +1,8 @@
sudo docker create \
--name=calibre --restart=always \
-v /srv/calibre/books:/books \
-v /srv/calibre/config:/calibre-web/config \
-v /etc/localtime:/etc/localtime:ro \
-e PGID=33 -e PUID=33 -p 8095:8083 \
technosoft2000/calibre-web

1
bin/lsync.sh Executable file
View File

@@ -0,0 +1 @@
rsync -av --progress --inplace --append-verify --remove-source-files -e "ssh -p 24" /mnt/ssd/deluge/done/$1 lusntag.vostan.org:/mnt/home/vahagn/tmp/tmp

BIN
bin/lusntag.socks5.bat Normal file

Binary file not shown.

BIN
bin/lusntag.socks5.ps1 Normal file

Binary file not shown.

BIN
bin/lusntag.socks5.sh Normal file

Binary file not shown.

16
bin/upload.ready.deluge.sh Executable file
View File

@@ -0,0 +1,16 @@
#!/bin/bash
set -x
if [ "$1" != "no-progress" ]; then
PROG=--progress
else
shift
fi
if [ ! -z "$*" ]; then
for i in "$@"; do
/usr/bin/rsync -av --inplace --progress --append-verify "/mnt/ssd/deluge/done/$i" "hrat:tmp/tmp/done/"
done
else
/usr/bin/rsync -av --inplace --append-verify $PROG /mnt/ssd/deluge/done hrat:tmp/tmp
fi

BIN
bin/yerevak.socks5.ps1 Normal file

Binary file not shown.

View File

@@ -62,28 +62,23 @@ shopt -s checkwinsize
#
# Terminal colors if interactive
#
# to see colors use
# for i in {0..255}; do echo $(tput setaf $i)$i; done
#
if [ -n "$PS1" ]; then
#
# If there is no terminal info in the system for current terminal but there is
# one in local terminfo then use it.
#
tput -T $TERM longname 2>/dev/null >/dev/null
if [ "$?" -ne "0" ] && [ -f $HOME/.terminfo/$kernel/${TERM:0:1}/$TERM ]; then
export TERMINFO=$HOME/.terminfo/$kernel;
fi
#tput -T $TERM longname 2>/dev/null >/dev/null
#if [ "$?" -ne "0" ] && [ -f $HOME/.terminfo/$kernel/${TERM:0:1}/$TERM ]; then
# export TERMINFO=$HOME/.terminfo/$kernel;
#fi
#
# Number of colors and standard colors.
#
c_num=$(tput colors)
# regular foreground
c_red=$(tput setaf 1)
c_green=$(tput setaf 2)
c_orange=$(tput setaf 3)
c_blue=$(tput setaf 4)
c_pink=$(tput setaf 5)
c_cyan=$(tput setaf 6)
c_white=$(tput setaf 7)
c_viol=$(tput setaf 12)
#
# bold foreground
#cbf_red=$(tput bold; tput setaf 1)
#
@@ -92,6 +87,23 @@ if [ -n "$PS1" ]; then
if [ $c_num -ge 256 ] && [ -f ~/.dir_colors ]; then
eval $(dircolors ~/.dir_colors)
fi
function term_colors(){
for i in {0..15}; do
for j in {0..15}; do
c=$((i*16+j));
printf " $(tput setab $c)%04d" $c;
done;
printf "$(tput sgr0)\n";
done
for i in {0..15}; do
for j in {0..15}; do
c=$((i*16+j));
printf " $(tput setaf $c)%04d" $c;
done;
printf "$(tput sgr0)\n";
done
}
fi
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -104,38 +116,28 @@ if [ -n "$PS1" ]; then
#
if [ $c_num -ge 256 ]; then
c_reset="$(tput sgr0)"
c_user="$c_green"
c_cwd="$c_viol"
c_time="$c_pink"
c_branch="$c_cyan"
c_exit="$c_red"
c_jobs="$c_orange"
c_user="$(tput setaf 203)" #Some bright color
c_host="$(tput setaf 112)" #Green
c_cwd="$(tput setaf 99)"
c_time="$(tput setaf 33)" #Light blue
c_branch="$(tput setaf 138)"
c_error="$(tput setaf 203)" #Red
c_info="$(tput setaf 220)" #Yellow
else
c_reset="$(tput sgr0)"
c_user="$c_green"
c_cwd="$c_viol"
c_time="$c_pink"
c_branch="$c_cyan"
c_exit="$c_red"
c_jobs="$c_orange"
c_user="$(tput setaf 1)" #
c_host="$(tput setaf 2)" #Green
c_cwd="$(tput setaf 7)" #White
c_time="$(tput setaf 6)" #Cyan
c_branch="$(tput setaf 6)" #Cyan
c_error="$(tput setaf 1)" #Red
c_info="$(tput setaf 3)" #Yellow
fi
[ -n "$(which svn)" ] && prompt_check_svn=true
[ -n "$(which git)" ] && prompt_check_git=true
#
# Colors should be set here and surrounded with \[\]otherwise bash fails to
# calculate prompt length. The text is set through PROMPT_COMMAND
PS1="\[$c_user\]\u@\h:" # username@host:
PS1+="\[$c_time\]\t" # time
PS1+=" \[$c_cwd\]\w" # working_dir
PS1+="\[$c_branch\]\$git_text" # git branch
PS1+="\[$c_branch\]\$svn_text" # svn revision
PS1+="\[$c_exit\]\$exit_text" # exit status of last command
PS1+="\[$c_jobs\]\$jobs_text" # background/suspended jobs
PS1+="\[$c_reset\]\$ " # reset colors and print $
export PROMPT_COMMAND="__prompt_command; $PROMPT_COMMAND"
export PROMPT_COMMAND="__prompt_command"
function __prompt_command()
{
#
@@ -144,46 +146,67 @@ if [ -n "$PS1" ]; then
#
local exit_code="$?"
prompt_extra=""
if [ "$USER" != "vkhachatrya5" -a "$USER" != "vahagn" ]; then
PS1="\[$c_user\]\u@" # username@
else
PS1=""
fi
PS1+="\[$c_host\]\h:" # hostname
PS1+="\[$c_time\]\t" # time
PS1+=" \[$c_cwd\]\w" # working_dir
#
# git branch if exist
#
if [ -n "$prompt_check_git" ]; then
local git_branch=$(git rev-parse --abbrev-ref HEAD 2> /dev/null | tr -d ' ')
if [ -n "$git_branch" ]; then
git_text="[$git_branch]"
else
git_text=""
PS1+="\[$c_branch\]/$git_branch"
fi
fi
#
# svn branch if exist
#
if [ -n "$prompt_check_svn" ]; then
local svn_rev=$(svn info . 2> /dev/null | awk -F ':' '/Revision:/ { print $2 }')
local svn_rev=$(svn info . 2> /dev/null | nawk -F ':' '/Revision:/ { print $2 }')
if [ -n "$svn_rev" ]; then
svn_text="[$svn_rev]"
else
svn_text=""
svn_text="@$svn_rev"
PS1+="\[$c_branch\]\$svn_text" # svn revision
fi
fi
#
# exit code if not zero
#
if [ "$exit_code" -ne "0" ]; then
exit_text="[exit=$exit_code]"
else
exit_text=""
PS1+=",\[$c_error\]rc=$exit_code"
fi
#
# Python venv.
#
local jobs_bg=$(jobs -r | wc -l | tr -d ' ')
if [ -n "$VIRTUAL_ENV" ]; then
# PS1+=",\[$c_info\]$(realpath --relative-to=$PWD $VIRTUAL_ENV)"
PS1+=",\[$c_info\]$(basename $VIRTUAL_ENV)"
fi
#
# Info about jobs.
#
local jobs_bg=$(jobs -r | wc -l | tr -d ' ')
local jobs_stopped=$(jobs -s | wc -l | tr -d ' ')
if [ $jobs_bg -gt 0 ] || [ $jobs_stopped -gt 0 ]; then
jobs_text="[bg:$jobs_bg,stp:$jobs_stopped]"
else
jobs_text=""
if [ $jobs_bg -gt 0 ]; then
PS1+=",\[$c_info\]bg=$jobs_bg"
fi
#
# Info about jobs.
#
local jobs_stopped=$(jobs -s | wc -l | tr -d ' ')
if [ $jobs_stopped -gt 0 ]; then
PS1+=",\[$c_info\]stp=$jobs_stopped"
fi
#
# Colors should be set here and surrounded with \[\]otherwise bash fails to
# calculate prompt length. The text is set through PROMPT_COMMAND
PS1+="\[$c_reset\]\$ " # reset colors and print $
}
# Turn on checkwinsize
shopt -s checkwinsize
@@ -221,6 +244,7 @@ fi
# VIM
#
export EDITOR=vim
export LESS=-R
#
# enable programmable completion features (you don't need to enable

View File

@@ -13,7 +13,12 @@
br = branch
co = checkout
ci = commit
svnsync = "!f(){ git co master && git pull && ssh devgit svnsync $(git config --get remote.origin.url | cut -d : -f 2 );}; f"
upload = "!f(){ git push $@ origin $(git rev-parse --abbrev-ref HEAD); }; f"
faxm = "!f(){ git fetch upstream master && git checkout -b ENG1FAXM-$1 upstream/master; }; f"
drqs = "!f(){ git fetch upstream master && git checkout -b DRQS-$1 upstream/master; }; f"
install-hooks = "!f(){ GIT_HOOKS=\"$(git rev-parse --git-dir)/hooks/\"; GOLDEN_HOOKS=\"$HOME/devel/scripts/git/hooks\"; [ -d \"$GIT_HOOKS\" ] && [ -d \"$GOLDEN_HOOKS\" ] && cp -rf \"$GOLDEN_HOOKS/.\" \"$GIT_HOOKS\"; }; f"
refresh-master = "!f(){ git fetch upstream master; git checkout upstream/master; git branch -D master; git checkout -b master; }; f"
setup-upstream = "!source $HOME/devel/scripts/git/setup-upstream.sh"
[merge]
tool = vimdiff
conflictstyle = diff3
@@ -24,16 +29,9 @@
[core]
excludesfile = ~/.gitignore.global
autocrlf = false
pager = less -F -X
[credentail]
helper = cache
[url "https://vishap@github.com/"]
insteadOf = github:
[url "https://gitlab.com/"]
insteadOf = gitlab:
[url "http://192.168.0.4:8080/"]
insteadOf = mylab:
[pager]
branch = false

23
config/.ssh/config Normal file
View File

@@ -0,0 +1,23 @@
Host lusntag
HostName lusntag.vostan.org
Port 8080
User vahagn
PreferredAuthentications publickey
Host yerevak
HostName yerevak.vostan.org
Port 24
User vahagn
PreferredAuthentications publickey
Host hrat
HostName 192.168.0.4
User vahagn
PreferredAuthentications publickey
Host github.com
User vishap
Hostname github.com
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa

View File

@@ -0,0 +1,17 @@
version: '2'
services:
gerbera:
hostname: gerbera
image: gerbera/gerbera:latest
network_mode: host
volumes:
- /srv/nextcloud:/var/www/html
- gerbera:/root/.config
- /srv/gerbera/music:/music
- /mnt/hdd2_2/movies:/video
restart: always
volumes:
gerbera:

View File

@@ -0,0 +1,27 @@
version: "3"
networks:
gitea:
external: false
services:
server:
image: gitea/gitea:1.12.6
container_name: gitea
environment:
- USER_UID=1000
- USER_GID=1000
restart: always
networks:
- gitea
volumes:
- gitea:/data
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
ports:
- "3000:3000"
- "222:22"
volumes:
gitea:

View File

@@ -0,0 +1,14 @@
version: '2'
services:
nextcloud:
image: nextcloud:18
ports:
- 8090:80
volumes:
- /srv/nextcloud:/var/www/html
- nextcloud:/var/www/html2
restart: always
volumes:
nextcloud:

5
git/.aspell.en_US.per Normal file
View File

@@ -0,0 +1,5 @@
personal_ws-1.1 en 0
FAXM
BLOT
Lakos
Vundle

44
git/hooks/commit-msg Executable file
View File

@@ -0,0 +1,44 @@
#!/bin/sh
#
# An example hook script to check the commit log message.
# Called by "git commit" with one argument, the name of the file
# that has the commit message. The hook should exit with non-zero
# status after issuing an appropriate message if it wants to stop the
# commit. The hook is allowed to edit the commit message file.
#
# To enable this hook, rename this file to "commit-msg".
# Uncomment the below to add a Signed-off-by line to the message.
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
# hook is more suited to it.
#
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
# This example catches duplicate Signed-off-by lines.
#test "" = "$(grep '^Signed-off-by: ' "$1" |
# sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
# echo >&2 Duplicate Signed-off-by lines.
# exit 1
#}
#
# SPELL CHECK
#
# 1. Install hunspell
# 2. Download a dictionary
# $ open http://wiki.services.openoffice.org/wiki/Dictionaries
# 3. Move this file into your repository
# $ mv commit-msg /path/to/repo/.git/hooks
# $ chmod +x /path/to/repo/.git/hooks/commit-msg
CHECK=$(cat $1 | head -1 | aspell --lang=en_US list --add-extra-dicts=$HOME/.aspell.en_US.per)
#CHECK=$(cat $1 | hunspell -s -d en_US,${HOME}/devel/scripts/git/my_dictionary -l)
if [ "${CHECK}" != "" ]; then
echo "Spell Check Error:"
#cat $1 | hunspell -a -d en_US,${HOME}/devel/scripts/git/my_dictionary -l
cat $1 | aspell -a --lang=en_US list --add-extra-dicts=$HOME/.aspell.en_US.per
echo "Use --no-verify if you want to commit."
exit 1
fi

44
git/hooks/prepare-commit-msg Executable file
View File

@@ -0,0 +1,44 @@
#!/bin/sh
#
# An example hook script to prepare the commit log message.
# Called by "git commit" with the name of the file that has the
# commit message, followed by the description of the commit
# message's source. The hook's purpose is to edit the commit
# message file. If the hook fails with a non-zero status,
# the commit is aborted.
#
# To enable this hook, rename this file to "prepare-commit-msg".
#
# Extract ticket id from the branch name and Append to commit message.
# Pattern NAME-NUMBER. e.g. ERROR-234
#
COMMIT_MSG_FILE=$1
COMMIT_SOURCE=$2
SHA1=$3
MESSAGE=$(cat $COMMIT_MSG_FILE)
TICKET=$(git rev-parse --abbrev-ref HEAD | grep -Eo '^(\w+/)?(\w+[-_])[0-9]+' | grep -Eo '(\w+[-])[0-9]+' | tr "[:lower:]" "[:upper:]"):
if [[ $TICKET == ":" || "$MESSAGE" == "$TICKET"* ]];then
exit 0;
fi
echo "$TICKET $MESSAGE" > $COMMIT_MSG_FILE
#/opt/bb/bin/perl5.16 -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
# case "$COMMIT_SOURCE,$SHA1" in
# ,|template,)
# /opt/bb/bin/perl5.16 -i.bak -pe '
# print "\n" . `git diff --cached --name-status -r`
# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
# *) ;;
# esac
# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
# if test -z "$COMMIT_SOURCE"
# then
# /opt/bb/bin/perl5.16 -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
# fi

51
git/setup-upstream.sh Executable file
View File

@@ -0,0 +1,51 @@
#!/bin/bash
git-setup-upstream(){
if [[ $# -ne 0 ]]; then
echo "Usage: just run inside a bbgithub repo."
return
fi
st=$(git status)
if [[ $? -ne 0 ]]; then
echo "Looks this is not a git repo."
return
fi
us=$(git remote get-url upstream 2> /dev/null)
if [[ $? -eq 0 ]]; then
echo "Upstream already exist as $us."
return
fi
url=$(git remote get-url origin)
if [[ $? -ne 0 ]]; then
echo "Origin URL is unknown."
return
fi
re="^(.*)[/:]([^/:]*)/(.*)$"
if [[ $url =~ $re ]]; then
prefix=${BASH_REMATCH[1]}
org=${BASH_REMATCH[2]}
repo=${BASH_REMATCH[3]}
else
echo "Failed to pars the repo URL."
return
fi
upstream_repo=bbgithub:$org/$repo
origin_repo=bbgithub:vkhachatrya5/$repo
git remote rm origin
echo "Setting origin=$origin_repo"
git remote add origin $origin_repo
echo "Setting upstream=$upstream_repo"
git remote add upstream $upstream_repo
git remote -v
}
git-setup-upstream

161
local/bb/.bashrc.local Executable file
View File

@@ -0,0 +1,161 @@
#!/bin/bash
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
# if chimera generated aliases exist, pull them into the current ENV
[ -f ~/.bbalias ] && . ~/.bbalias
#wget
#export http_proxy=devproxy.bloomberg.com:82
#export https_proxy=devproxy.bloomberg.com:82
#export DEV_CINC=-I.
#export DEV_CPPINC=-I.
#export DEV_FINC=-I.
#I need this to run distributor locally.
export PGPASSFILE=$HOME/.pgpass
export PGSERVICEFILE=$HOME/.fit_pg_service.conf
export SRC_DIR=$HOME/devel/src
export BOOST_DIR=$SRC_DIR/boost
#export TBB_DIR=$SRC_DIR/tbb
#export TBB_LIB=$TBB_DIR/build/linux_intel64_gcc_cc4.8.2_libc2.12_kernel2.6.32_release/
#export TBB_LIB_DEBUG=$TBB_DIR/build/linux_intel64_gcc_cc4.8.2_libc2.12_kernel2.6.32_debug/
export PIP_INDEX_URL=https://artprod.dev.bloomberg.com/artifactory/api/pypi/bloomberg-pypi/simple
alias bb='cd $HOME/bb >/dev/null'
complete -W "build clean build_all clean_all dpkg install default all" make
stty sane # should normalize backspace issues?
#
# BLOOMBERG and TOMS
#
export BB=$HOME/devel/bb
PATH=$PATH:$BB/scripts
PATH=$MYSCRIPTS/local/bb:$PATH
# PATH=$HOME/bb/bas-codegen/bin:$PATH
if [[ "$os" == "GNU/Linux" ]]; then
export IS_64BIT=yes
BBBITS=64
#PATH=/bb/build/Linux-x86_64-64/release/robolibs/stage/opt/bb/libexec/build-base/:$PATH
else
BBBITS=32
fi
export BBTAG=$(/opt/bb/bin/robolibs-current-build --tag trunk --bits $BBBITS)
getop() { # BOX
if [[ $# -ne 1 ]]; then
echo "Usage: getop <machine>"
else
local BOX="$1"
local BIN="/bb/bin/getprdwin"
$BIN -u op1 -i -s $BOX -d "op1 for $USER on $BOX"
fi
}
run() {
if [[ $# -lt 1 ]]; then
echo "Usage: run <server> <command>"
elif [[ $# -eq 1 ]]; then
SERVER=$1
ssh $LOGNAME@$SERVER "cd $PWD; exec $BASH --login"
else
SERVER=$1
shift
ssh $LOGNAME@$SERVER "cd $PWD; $@"
fi
}
use-blot-meta(){
export DPKG_ARCH=$(/opt/bb/bin/dpkg-architecture -qDEB_BUILD_ARCH)
export DPKG_DISTRO_DIR=$HOME/bb/blot-meta/cmake-distro-dev/${DPKG_ARCH}
}
use-local-distro(){
unset DPKG_ARCH
unset DPKG_DISTRO_DIR
}
#
#alias dirs='dirs -v'
#alias ack='ack --ignore-file=ext:d,dd'
#
#alias dirtree="ls -R | grep ":$" | sed -e 's/:$//' -e 's/[^-][^\/]*\//--/g' -e 's/^/ /' -e 's/-/|/' "
#alias currgit='cd /bb/mbig/mbig1205/devgit/s_tktapi2/src; echo -e "I am here $(pwd)"'
#alias tktapi='cd /bb/mbig/mbig1205/devgit/tktapi/src; echo -e "I am here $(pwd) \n $(ls)"'
#alias bastest='/bbsrc/abin/basclient'
#alias bas_codegen='/bb/shared/bin/bas_codegen.pl'
#alias metasymfind="cat - | awk '{ print \$1 }' | xargs symfind | awk 'BEGIN{FS=\"[\"} { print \$1 }' | sort | uniq | tr '\n' ' ' | sed -e 's/\(\b\S\)/-l\1/g' && echo \"\""
#
#alias git-robo='ssh devgit svnsync $(git remote -v | grep "(fetch)" | cut -d ":" -f2 | cut -d "(" -f1); git fetch origin; git pull; git merge robo/trunk; read -p "!!!!! PUSH the merged version back !!!!! ? [Y] / Ctrl+C to stop"; git push'
#alias intuorcreate=/bbsrc/internal/isystest/uorcreate/intuorcreate
#
#
#
#export BIGHOME=/bb/mbig/mbig1205
#export PLINK_PARALLEL_BUILD=true
#export EDITOR=/opt/swt/bin/nedit
#export PAGER=less
#export GROUP=trading-systems-group
#export mysvn="svn+ssh://devsvn"
#export myrobosvn="svn+ssh://devsvn/robo/branches/trunk"
#export PATH=/opt/swt/bin:~/bin:/bb/util/common/studio12/SUNWspro/bin:${PATH}
#export DEVGIT=${BIGHOME}/devgit
#export VISUAL=/opt/swt/bin/nedit
#export MAIL=/usr/mail/${LOGNAME:?}
#
#
#
##ssh() {
# #echo "wut"
# #[[ -n "$INSCREEN" ]] && TERM=screen-256color
# #env ssh -t $*
# #$SCREEN_TITLE_CMD
##}
#
#
#biggest() {
# dir=${1:-.}
# find $dir -type f -exec du -a {} \+ | sort -rn
#}
#
## Screen variables
#function last2dirs {
# pwd | awk -F\/ '{print $(NF-1),$(NF)}' | sed 's# #/#'
#}
#
##screen specific functionality
##if [[ -n ${STY} ]]
##then
# PROMPT_COMMAND='echo -ne "\033k${HOSTNAME} $(last2dirs)\033\\";
# history -a;'
##fi
#
#function dupscreen {
# screen bash -c "export SSHCDPATH=$PWD && exec $SHELL --login"
#}
#
#if [[ -e ~/.git-completion.bash ]]
#then
# source ~/.git-completion.bash
#fi
#
#if [ -n "$BBENV" ] && [[ -f ~/bin/hijackEOD.sh ]]
#then
# source `which hijackEOD.sh`
#fi
#
#
#
# Don't source the rest twice.
#
#if [ "$BASHRC_VAHAGNK_DONT_SOURCE_THIS_FILE_TWICE" == "true" ]; then
# return
#fi

48
local/bb/.vimrc.lib Executable file
View File

@@ -0,0 +1,48 @@
let g:srcdir="/home/vkhachatrya5/devel/src"
"
" STL
"
"let &path.=",".g:tbbinc
"
" BOOST
"
let g:boostdir=g:srcdir."/boost"
let g:boostinc=g:boostdir
let g:boostlib=g:boostdir."/stage/lib"
let g:boostbin=g:boostlib
let g:Bboost=g:boostbin.":"
let g:Iboost=" -I".g:boostinc
let g:Lboost=" -L".g:boostlib
let g:boost=g:Iboost.g:Lboost
let &path.=",".g:boostinc
"
" Intel TBB
"
let g:tbbdir=g:srcdir."/tbb"
let g:tbbinc=g:tbbdir."/include"
let g:tbblib=g:tbbdir."/build/linux_intel64_gcc_cc4.8.2_libc2.5_kernel2.6.18_release"
let g:tbbbin=g:tbblib
let g:Itbb=" -I".g:tbbinc
let g:Ltbb=" -L".g:tbblib." -ltbb"
let g:tbbmalloc=" -ltbbmalloc"
let g:tbbmproxy=" -ltbbmalloc_proxy"
let g:tbb=g:Itbb.g:Ltbb
let &path.=",".g:tbbinc
"
" Robo
"
let g:robodir="/bb/build/Linux-x86_64-64/release/robolibs/stage/dpkgroot/opt/bb/include"
let g:roboinc=g:robodir."/include"
let g:robolib=g:robodir."/lib64"
let g:Ibb=" -I".g:roboinc
let g:Lbb=" -L".g:robolib
let g:bb=g:Ibb.g:Lbb
let &path.=",".g:roboinc
"
" Append library paths to LD_LIBRARY_PATH
"
"let $LD_LIBRARY_PATH .= ':'.g:boostlib.':'.g:tbblib

31
local/bb/.vimrc.local Executable file
View File

@@ -0,0 +1,31 @@
set expandtab
set visualbell
" Uncomment below to make screen not flash on error
set vb t_vb=""
set wildignore+=*.o,*.obj,*.bak,*.exe,*.tsk,*.d,*.dd
"set path=.,/usr/include,/usr/include/c++/4.4.4,../,../../src,../src,./src
set path=.,/usr/include,../../src,../src,./src
set path+=/bb/build/SunOS-sparc-32/release/robolibs/stage/dpkgroot/opt/bb/include/stlport
set path+=/bb/build/SunOS-sparc-32/release/robolibs/stage/opt/bb/include/
set path+=/bb/build/SunOS-sparc-32/release/robolibs/stage/opt/bb/include/00depbuild
set path+=/bb/build/SunOS-sparc-32/release/robolibs/stage/opt/bb/include/00deployed
set path+=/bb/build/SunOS-sparc-32/release/robolibs/stage/opt/bb/include/00offlonly
set path+=/bb/build/share/stp/include/00offlonly
set path+=/bbsrc/thirdparty/bbit/include
set path+=/bb/build/SunOS-sparc-32/release/robolibs/stage/dpkgroot/opt/bb/include/
set tags+=tags
set tags+=./tags
set tags+=../tags
set tags+=../../tags
"set tags+=../../../tags
"set tags+=../../../../tags
"set tags+=~/devel/bb/bbsrc/tags/all.tags
"for t in split(glob('~/devel/bb/bbsrc/tags/*.tags'), '\n')
" exec "set tags+=".t
"endfor
autocmd FileType make set noexpandtab

View File

@@ -0,0 +1,93 @@
#!/bin/bash
#wget
#export http_proxy=devproxy.bloomberg.com:82
#export https_proxy=devproxy.bloomberg.com:82
export DOCKER_HOST=tcp://0.0.0.0:2375
if [[ "$(hostname)" == "lnxmqts01" ]]; then
export SKELETON_DEPLOY=$HOME/devel/bb/skeleton_internals
fi
#export DEV_CINC=-I.
#export DEV_CPPINC=-I.
#export DEV_FINC=-I.
#I need this to run distributor locally.
#export PGPASSFILE=$HOME/.fit_pgpass
#export PGSERVICEFILE=$HOME/.fit_pg_service.conf
export IS_64BIT=yes
BBBITS=64
#PATH=/bb/build/Linux-x86_64-64/release/robolibs/stage/opt/bb/libexec/build-base/:$PATH
#export BBTAG=$(/opt/bb/bin/robolibs-current-build --tag local --bits $BBBITS) #Doesn't work on bbvpn
export ARCHCODE=amd64
export DPKG_DISTRO=unstable
export DPKG_DISTRO_DIR=$HOME/cmake-distro-dev
#export DPKG_SNAPSHOT=$(/opt/bb/bin/dpkg-distro-current-snapshot $DPKG_DISTRO) #This is slow.
export PATH=/opt/bb/bin:$PATH
getop() { # BOX
if [[ $# -ne 1 ]]; then
echo "Usage: getop <machine>"
else
local BOX="$1"
local BIN="/bb/bin/getprdwin"
$BIN -u op1 -i -s $BOX -d "op1 for $USER on $BOX"
fi
}
git-repo-setup(){
if [[ $# -ne 0 ]]; then
echo "Usage: just run inside a bbgithub repo."
return
fi
st=$(git status)
if [[ $? -ne 0 ]]; then
echo "Looks this is not a git repo."
return
fi
us=$(git remote get-url upstream 2> /dev/null)
if [[ $? -eq 0 ]]; then
echo "Upstream already exist as $us."
return
fi
url=$(git remote get-url origin)
if [[ $? -ne 0 ]]; then
echo "Origin URL is unknown."
return
fi
re="^(.*)[/:]([^/:]*)/(.*)$"
if [[ $url =~ $re ]]; then
prefix=${BASH_REMATCH[1]}
org=${BASH_REMATCH[2]}
repo=${BASH_REMATCH[3]}
else
echo "Failed to pars the repo URL."
return
fi
upstream_repo=bbgithub:$org/$repo
origin_repo=bbgithub:vkhachatrya5/$repo
git remote rm origin
echo "Setting origin=$origin_repo"
git remote add origin $origin_repo
echo "Setting upstream=$upstream_repo"
git remote add upstream $upstream_repo
git remote -v
}
git-master-refresh(){
git fetch upstream master
git co upstream/master
git br -D master
git co -b master
}

View File

@@ -6,26 +6,15 @@
insteadOf = https://bbgithub.dev.bloomberg.com
[http "https://github.com"]
proxy = http://proxy.bloomberg.com:81
sslCAinfo = /usr/local/share/ca-certificates/bloomberg-root-ca.crt
[url "https://github.com/"]
insteadOf = github.com:
[url "https://github.com/"]
insteadOf = git@github.com:
[url "https://github.com/"]
insteadOf = ssh://git@github.com/
proxy = socks5://127.0.0.1:1080
#proxy = http://proxy.bloomberg.com:81
#sslCAinfo = /usr/local/share/ca-certificates/bloomberg-root-ca.crt
[http "https://gitlab.com"]
proxy = http://proxy.bloomberg.com:81
sslCAinfo = /usr/local/share/ca-certificates/bloomberg-root-ca.crt
[url "https://gitlab.com/"]
insteadOf = gitlab.com:
[url "https://gitlab.com/"]
insteadOf = git@gitlab.com:
[url "https://gitlab.com/"]
insteadOf = ssh://git@gitlab.com/
proxy = socks5://127.0.0.1:1080
#proxy = http://proxy.bloomberg.com:81
#sslCAinfo = /usr/local/share/ca-certificates/bloomberg-root-ca.crt
[http "http://192.168.0.4:8080"]
proxy = socks5://127.0.0.1:1080

View File

@@ -0,0 +1,59 @@
# Note that value for 'User' must be 'git'.
Host bbgithub bbgithub.dev.bloomberg.com
HostName bbgithub.dev.bloomberg.com
IdentityFile ~/.ssh/bbgithub
User git
UserKnownHostsFile /dev/null
StrictHostKeyChecking no
Host github.com
User vishap
Hostname github.com
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa_home
ProxyCommand=nc -X 5 -x localhost:1080 %h %p
Host lusntag
HostName lusntag.vostan.org
Port 8080
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa_home
User vahagn
ProxyCommand=nc -X 5 -x localhost:1080 %h %p
Host yerevak
HostName yerevak.vostan.org
Port 24
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa_home
User vahagn
ProxyCommand=nc -X 5 -x localhost:1080 %h %p
Host hrat
HostName 192.168.0.4
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa_home
User vahagn
ProxyCommand=nc -X 5 -x localhost:1080 %h %p
Host *
AddKeysToAgent yes
IdentitiesOnly yes
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
Host v5dev v5devgateway.bdns.bloomberg.com
ControlMaster auto
ControlPersist 8h
IdentityFile ~/.ssh/id_rsa.openssh
ControlPath /tmp/%r@%h-%p
Port 22
Host *.bloomberg.com !bbgithub.dev.bloomberg.com !v5prqsgateway.bdns.bloomberg.com
ControlPath /tmp/%r@%h-%p
ControlMaster auto
ControlPersist 24h

24
local/yerevak/.ssh/config Normal file
View File

@@ -0,0 +1,24 @@
# Note that value for 'User' must be 'git'.
Host lusntag
HostName lusntag.vostan.org
Port 8080
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa
User vahagn
Host yerevak
HostName yerevak.vostan.org
Port 24
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa
User vahagn
Host hrat
HostName 192.168.0.4
PreferredAuthentications publickey
IdentityFile ~/.ssh/id_rsa
User vahagn
ProxyCommand=ssh -W %h:%p lusntag

7
motd/hrat.motd Normal file
View File

@@ -0,0 +1,7 @@
__
\ \ _____ _ _ _ _ ____
/ / / _ | | | | | | | / _ \
/ /___| | |_| |_| |_| | |_| | | |
(______| | \________/\_____/ |_|
|_|

7
motd/lusntag.motd Normal file
View File

@@ -0,0 +1,7 @@
_ _
| | ____ _ |_\_ ___ _ _ _ ___
| | / _ \ _ | | | | | __/ _ \| | | | | |/ _ \
| |__| | | | |_| |_| | |_) | |/) / |_| | | | (_) |_
\____|_| |_|___,\___/ \___/| |\_/\_________/\__ _|
|_| |_|

9
motd/yerevak.motd Normal file
View File

@@ -0,0 +1,9 @@

_ _ _
| |__ ____ | |_ _ _ _| |
| __|_/ _ \| _|_ _ | | | | | | | _
| |__| | | |_| |_| | |_| |_| |_| | |_| |
\____/| | \____/\___\_______ _/\__ |
|_| |_|


1
vim/spell/en.utf-8.add Normal file
View File

@@ -0,0 +1 @@
mv

BIN
vim/spell/en.utf-8.add.spl Normal file

Binary file not shown.

View File

@@ -426,8 +426,7 @@ if filereadable(expand(s:vundle_path.'/README.md'))
let g:airline#extensions#tabline#left_alt_sep = '|'
let g:airline_powerline_fonts = 1
"
"
"
Plugin 'scrooloose/nerdtree'
let g:NERDTreeQuitOnOpen = 1
@@ -486,6 +485,7 @@ if filereadable(expand(s:vundle_path.'/README.md'))
" Tmux integration.
"
Plugin 'benmills/vimux'
"
" Extends modeline to variables.
" Needed by CF5 compile to read options right from file.