Skip to content

Commit

Permalink
Merge branch 'release/2.0.5' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
hcartiaux committed Mar 17, 2017
2 parents f4c7f82 + 3e0e689 commit caf4469
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.4
2.0.5
4 changes: 3 additions & 1 deletion bash/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,9 @@ else
fi

# Configure a set of useful variables for the prompt
if [[ "$(echo $UNAME | grep -c -i -e '^.*bsd$')" == "1" ]] ; then
if [[ -e /proc/sys/kernel/hostname ]] ; then
DOMAIN=$(cat /proc/sys/kernel/hostname | cut -d '.' -f 2)
elif [[ "$(echo $UNAME | grep -c -i -e '^.*bsd$')" == "1" ]] ; then
DOMAIN=$(hostname | cut -d '.' -f 2)
else
DOMAIN=$(hostname -f | cut -d '.' -f 2)
Expand Down

0 comments on commit caf4469

Please sign in to comment.