| ... | ... |
@@ -1,14 +1,15 @@ |
| 1 | 1 |
# Title: .bash_profile |
| 2 | 2 |
# Author: Frédéric CHEVALIER <f15.chevalier@gmail.com> |
| 3 |
-# Version: 3.1 |
|
| 3 |
+# Version: 3.2 |
|
| 4 | 4 |
# Created in: 2012-05-25 |
| 5 |
-# Modified in: 2021-05-19 |
|
| 5 |
+# Modified in: 2022-09-10 |
|
| 6 | 6 |
|
| 7 | 7 |
|
| 8 | 8 |
#==========# |
| 9 | 9 |
# Versions # |
| 10 | 10 |
#==========# |
| 11 | 11 |
|
| 12 |
+# v3.2 - 2022-09-10: add timeout on welcome message |
|
| 12 | 13 |
# v3.1 - 2021-05-19: updates related to severs and SGE config changes (e.g., queue) / new env variable added |
| 13 | 14 |
# v3.0 - 2020-03-01: Linuxbrew added / Miniconda added / some Python env variables removed / R env variables removed / PATH setup improved / misc updates |
| 14 | 15 |
# v2.3 - 2019-03-10: alias updated / R hack for medusa2 added / no ssh key usage or storage for heron |
| ... | ... |
@@ -211,19 +212,24 @@ fi |
| 211 | 212 |
if [[ ! ($HOSTNAME =~ heron* || $HOSTNAME =~ compute.*) && (-z $LC_STY || $LC_STY != 1) ]] |
| 212 | 213 |
then |
| 213 | 214 |
mydisk="/master" |
| 214 |
- echo "" |
|
| 215 |
- for i in $mydisk |
|
| 216 |
- do |
|
| 217 |
- [[ ! $(df -h 2> /dev/null | grep "$i ") ]] && continue |
|
| 218 |
- echo -e "\033[33mSpace available on $i [% Used/Total/Free]:\033[00m $(df -h 2> /dev/null | grep "$i " | awk '{print $5" / "$2" / "$4}')"
|
|
| 219 |
- done |
|
| 220 |
- echo "" |
|
| 215 |
+ dspace=$(timeout 5s df -h 2> /dev/null) |
|
| 216 |
+ if [[ -n "$dspace" ]] |
|
| 217 |
+ then |
|
| 218 |
+ echo "" |
|
| 219 |
+ for i in $mydisk |
|
| 220 |
+ do |
|
| 221 |
+ [[ ! $(grep "$i " <<< "$dspace") ]] && continue |
|
| 222 |
+ echo -e "\033[33mSpace available on $i [% Used/Total/Free]:\033[00m $(grep "$i " <<< "$dspace" | awk '{print $5" / "$2" / "$4}' | head -n 1)"
|
|
| 223 |
+ done |
|
| 224 |
+ echo "" |
|
| 225 |
+ fi |
|
| 221 | 226 |
|
| 222 | 227 |
if [[ ($name == "zeus") && (-z $LC_STY || $LC_STY != 1) ]] |
| 223 | 228 |
then |
| 229 |
+ cores=$(timeout 5s qstat -g c) |
|
| 224 | 230 |
echo -e "\033[33mCores available:\033[00m\n" |
| 225 |
- qstat -g c |
|
| 226 |
- echo -e "\n" |
|
| 231 |
+ echo -e "$cores\n" |
|
| 227 | 232 |
fi |
| 228 | 233 |
fi |
| 229 | 234 |
|
| 235 |
+unset dspace |