From: Andrew DeFaria Date: Mon, 31 Oct 2016 17:21:25 +0000 (-0700) Subject: Various changes for supporting Broadcom/Avago X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=403a570db9974377d99b2f2b02ce9c6c374f8008;p=clearscm.git Various changes for supporting Broadcom/Avago --- diff --git a/rc/client_scripts/Broadcom b/rc/client_scripts/Broadcom index 2326591..6c4a404 100644 --- a/rc/client_scripts/Broadcom +++ b/rc/client_scripts/Broadcom @@ -12,12 +12,10 @@ # (c) Copyright 2012, Andrew@DeFaria.com, all rights reserved. # ################################################################################ -append_to_path /projects/mob_tools/scripts -append_to_path /projects/mob_tools/bin +prepend_to_path /tools/bin +prepend_to_path /usr/brcm/ba/bin + append_to_path /tools/ecloud/commander/bin -append_to_path /usr/brcm/ba/bin -append_to_path /projects/mob_tools/scripts -append_to_path /tools/bin append_to_path /opt/Perforce if [ -f "/cygdrive/c/Program Files/Perforce/p4.exe" ]; then @@ -28,6 +26,4 @@ fi alias baperl=/usr/brcm/ba/bin/perl -export CDPATH=$CDPATH:/mcsi:/mob_tools - -alias repo=/projects/mob_tools/bin/repo +export CDPATH=$CDPATH:/tools:/projects \ No newline at end of file diff --git a/rc/gitconfig b/rc/gitconfig index 63b5588..8c4dc6b 100644 --- a/rc/gitconfig +++ b/rc/gitconfig @@ -1,39 +1,45 @@ [user] - name = Andrew DeFaria - email = Andrew@DeFaria.com + name = Andrew DeFaria + email = Andrew@DeFaria.com + [pack] - windowMemory=128m - threads=1 - deltaCacheSize=128m + windowMemory=128m + threads=1 + deltaCacheSize=128m + [core] - pager = less -RX - packedGitLimit=128m - packedGitWindowSize=128m + pager = less -RX + packedGitLimit=128m + packedGitWindowSize=128m + [color] - status=auto - diff=auto - branch=auto + status=auto + diff=auto + branch=auto # Currently these are restating the default [color "branch"] - current=green - local=white - remote=red + current=green + local=white + remote=red + [color "diff"] - external = /usr/local/bin/git-meld + external = /usr/local/bin/git-meld + [color "status"] - added=yellow - changed=green - untracked=cyan + added=yellow + changed=green + untracked=cyan [alias] - co=checkout - ci=commit - st=status - br=branch - hist=log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short - type=cat-file -t - dump=cat-file -p - dlog=log --decorate + co=checkout + ci=commit + st=status + br=branch + hist=log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short + type=cat-file -t + dump=cat-file -p + dlog=log --decorate + [push] - default = simple + default = simple diff --git a/rc/set_colors b/rc/set_colors index 7c991a3..5b283de 100644 --- a/rc/set_colors +++ b/rc/set_colors @@ -16,11 +16,19 @@ esc=$(echo "\033") if [ "$TERM" = "vt100" -o \ "$TERM" = "vt220" ]; then - NORMAL="$esc[0m" - BOLD="$esc[1m" - UNDERLINE="$esc[4m" - BLINK="$esc[5m" - INVERSE="$esc[7m" + NORMAL="$esc[0m" + BOLD="$esc[1m" + UNDERLINE="$esc[4m" + BLINK="$esc[5m" + INVERSE="$esc[7m" + + if [ "$1" = '-v' ]; then + echo "Terminal: $TERM" + echo -e "${BOLD}Bold$NORMAL" + echo -e "${UNDERLINE}Underline$NORMAL" + echo -e "${BLINK}Blink$NORMAL" + echo -e "${INVERSE}Inverse$NORMAL" + fi elif [ "$TERM" = "dtterm" -o \ "$TERM" = "xterm" ]; then NORMAL="$esc[39m" @@ -38,6 +46,17 @@ elif [ "$TERM" = "dtterm" -o \ B_AQUA=$AQUA WHITE="$esc[36m" B_WHITE=$WHITE + + if [ "$1" = "-v" ]; then + echo "Terminal: $TERM" + echo -e "${RED}Red$NORMAL\t${B_RED}Bright red$NORMAL" + echo -e "${GREEN}Green$NORMAL\t${B_GREEN}Bright green$NORMAL" + echo -e "${YELLOW}Yellow$NORMAL\t${B_YELLOW}Bright green$NORMAL" + echo -e "${BLUE}Blue$NORMAL\t${B_BLUE}Bright blue$NORMAL" + echo -e "${MAGENTA}Magenta$NORMAL\t${B_MAGENTA}Bright magenta$NORMAL" + echo -e "${AQUA}Aqua$NORMAL\t${B_AQUA}Bright aqua$NORMAL" + echo -e "${WHITE}White$NORMAL\t${B_WHITE}Bright white$NORMAL" + fi elif [ "$TERM" = "xterm-256color" ]; then NORMAL="$esc[39m" BLACK="$esc[30m" @@ -55,6 +74,15 @@ elif [ "$TERM" = "xterm-256color" ]; then LIGHT_MAGENTA="$esc[94m" LIGHT_CYAN="$esc[96m" WHITE="$esc[97m" + + if [ "$1" = "-v" ]; then + echo "Terminal: $TERM" + echo -e "${RED}Red$NORMAL\t${GREEN}Green$NORMAL\t${YELLOW}Yellow$NORMAL" + echo -e "${BLUE}Blue$NORMAL\t${MAGENTA}Magenta$NORMAL\t${CYAN}Cyan$NORMAL" + echo -e "${BLACK}Black$NORMAL\t${LIGHT_GRAY}Light gray$NORMAL\t${DARK_GRAY}Dark gray$NORMAL" + echo -e "${LIGHT_RED}Light red$NORMAL\t${LIGHT_GREEN}Light green$NORMAL\t${LIGHT_YELLOW}Light yellow$NORMAL" + echo -e "${LIGHT_MAGENTA}Light magenta\t${LIGHT_CYAN}Light cyan$NORMAL\t${WHITE}White$NORMAL" + fi elif [ "$TERM" = "hp" -o "$TERM" = "hpterm" ]; then NORMAL="$esc&d@$esc&v0S" RED="$esc&v1S" @@ -81,4 +109,15 @@ elif [ "$TERM" = "hp" -o "$TERM" = "hpterm" ]; then INVERSE="$esc&v7S" HB_INVERSE="$esc&v7S$esc&dK" B_INVERSE="$esc&v7S$esc&dB" + + if [ "$1" = "-v" ]; then + echo "Terminal: $TERM" + echo -e "${RED}Red$NORMAL\t${HB_RED}Half bright red$NORMAL\t${B_RED}Bright red$NORMAL" + echo -e "${GREEN}Green$NORMAL\t${HB_GREEN}Half bright green$NORMAL\t${B_GREEN}Bright green$NORMAL" + echo -e "${YELLOW}Yellow$NORMAL\t${HB_YELLOW}Half bright yellow$NORMAL\t${B_YELLOW}Bright yellow$NORMAL" + echo -e "${BLUE}Blue$NORMAL\t${HB_BLUE}Half bright blue$NORMAL\t${B_BLUE}Bright blue$NORMAL" + echo -e "${PURPLE}Purple$NORMAL\t${HB_PURPLE}Half bright purple$NORMAL\t${B_PURPLE}Bright Purple$NORMAL" + echo -e "${AQUA}Aqua\t${HB_AQUA}Half bright aqua$NORMAL\t${B_AQUA}Bright aqua$NORMAL" + echo -e "${INVERSE}Inverse$NORMAL\t${HB_INVERSSE}Half bright inverse$NORMAL\t${B_INVERSE}Bright inverse$NORMAL" + fi fi diff --git a/rc/set_path b/rc/set_path index cccac0d..c3f9580 100644 --- a/rc/set_path +++ b/rc/set_path @@ -14,7 +14,7 @@ ################################################################################ function append_to_path { component="$1" - + if [ -d "$component" ]; then if [ -z "$PATH" ]; then PATH="$component" @@ -24,6 +24,14 @@ function append_to_path { fi } # append_to_path +function prepend_to_path { + component="$1" + + if [ -d "$component" ]; then + PATH="$component:$PATH" + fi +} # prepend_to_path + function append_to_manpath { component="$1" @@ -135,4 +143,3 @@ if [ "hp-ux" = "10" ]; then export SHLIB_PATH=$SHLIB_PATH:$M_LROOT/bin export LD_LIBRARY_PATH=$SHLIB_PATH:$M_LROOT/bin fi - diff --git a/rc/sshconfig b/rc/sshconfig index a49bcad..46b7b38 100644 --- a/rc/sshconfig +++ b/rc/sshconfig @@ -1,6 +1,7 @@ ForwardX11 yes -#ForwardX11Trusted yes +ForwardX11Trusted yes StrictHostKeyChecking no +Loglevel QUIET Host * ServerAliveInterval 300 @@ -9,10 +10,32 @@ Host * Host home Hostname defaria.com User andrew - -Host defaria.com - User andrew IdentityFile ~/.ssh/id_ecdsa + +Host gerrit-rtp + Hostname gerrit-ccxsw.rtp.broadcom.com + User svcccxswgit -Host * - User adefaria +Host vdi + Hostname sjrvda0482.sjs.avagotech.net + +Host eca-rtp-02 + Hostname eca-rtp-02.rtp.broadcom.com + User ccxswbuild + +Host eca-rtp-04 + Hostname eca-rtp-04.rtp.broadcom.com + User ccxswbuild + +Host git-ric + Hostname git-ccxsw.ric.broadcom.com + #User svcccxswgit + User ccxswbuild + +Host git-rtp + Hostname git-ccxsw.rtp.broadcom.com + #User svcccxswgit + User ccxswbuild + +Host jira-dev + Hostname jira-rtp-06.rtp.broadcom.com diff --git a/rc/system b/rc/system index e92c7f1..7f16ea4 100644 --- a/rc/system +++ b/rc/system @@ -23,7 +23,7 @@ SYSNAME=$(echo ${SYSNAME:0:1} | tr [:lower:] [:upper:])$(echo ${SYSNAME:1} | t # Aliasing case "$SYSNAME" in - Ande-4848) - SYSNAME="ADeFaria" + C02s608vg8wp) + SYSNAME="Venus" ;; esac