hcartiaux/dotfiles
1
0
Fork 0
mirror of https://github.com/hcartiaux/dotfiles.git synced 2024-10-18 17:25:23 +02:00
Code Activity

[bash] environment - fix G5K detection

Browse source
This commit is contained in:
Hyacinthe Cartiaux 2014-02-18 16:22:31 +01:00
parent aaf092a8ac
commit 6cd0b09c0a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bash/bash_environment
View file

@ -32,12 +32,13 @@ export LANG LANGUAGE LC_CTYPE LC_ALL
# Get rid of mail notification # Get rid of mail notification
unset MAILCHECK unset MAILCHECK
# Configure a set of useful variables for the prompt # Configure a set of useful variables
if [[ "`echo $UNAME | grep -c -i -e '^.*bsd$'`" == "1" ]] ; then if [[ "`echo $UNAME | grep -c -i -e '^.*bsd$'`" == "1" ]] ; then
DOMAIN=`hostname | cut -d '.' -f 2` FQDN=`hostname`
else else
DOMAIN=`hostname -f | cut -d '.' -f 2` FQDN=`hostname -f`
fi fi
DOMAIN=`echo $FQDN | cut -d '.' -f 2`
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# SHELL TYPE # SHELL TYPE
@ -120,7 +121,7 @@ export TSOCKS_CONF_FILE=~/.dotfiles/tsocks/tsocks.conf
# GRID5000 specific # GRID5000 specific
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
if [[ "$DOMAIN" = "luxembourg" ]] ; then if [[ -n "`echo $FQDN | grep -o .grid5000.fr`" ]] ; then
export OAR_JOB_KEY_FILE=~/.ssh/id_rsa export OAR_JOB_KEY_FILE=~/.ssh/id_rsa
export HTTP_PROXY=http://proxy:3128 export HTTP_PROXY=http://proxy:3128
export HTTPS_PROXY=$HTTP_PROXY export HTTPS_PROXY=$HTTP_PROXY