From debb06759368f1f42120785472c030618fd35f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= <mikael.capelle@typename.fr>
Date: Thu, 8 Jun 2017 15:05:52 +0200
Subject: [PATCH] Update fish configurations.

---
 fish/config.fish | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/fish/config.fish b/fish/config.fish
index 607b316..3e2835a 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -11,19 +11,24 @@ alias l='ls -CF'
 
 alias rm='rm -i --preserve-root'
 
-# GUROBI
-set GUROBI_PATH $HOME/.softwares/gurobi651/linux64
-if [ -e $GUROBI_PATH ]
-    set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib $GUROBI_PATH/lib
-    set -x GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
-    set -x PATH $PATH $GUROBI_PATH/bin
-    set -x PYTHONPATH $PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32
-end
+if test -z "$MYSOFT_PATH"
+
+    set -xg MYSOFT_PATH {$HOME}/.softwares
+
+    if test -e $MYSOFT_PATH
+        set -xg PATH $PATH $MYSOFT_PATH/bin
+        set -xg PYTHONPATH "$MYSOFT_PATH/pythonlibs:$PYTHONPATH"
+
+        # GUROBI
+        if ls $MYSOFT_PATH | grep "gurobi" > /dev/null
+            set -xg GUROBI_PATH (ls -d $MYSOFT_PATH/gurobi*/linux64 | tail -1)
+            set -xg LD_LIBRARY_PATH "$LD_LIBRARY_PATH:$GUROBI_PATH/lib"
+            set -xg GRB_LICENSE_FILE $GUROBI_PATH/gurobi.lic
+            set -xg PATH $GUROBI_PATH/bin $PATH
+            #set -x PYTHONPATH $GUROBI_PATH/lib/python3.4_utf32:$PYTHONPATH
+        end
+    end
 
-# CUSTOM
-set MYSOFT_PATH $HOME/.softwares/bin
-if [ -e $MYSOFT_PATH ]
-    set -x PATH ~/.softwares/bin $PATH
 end
 
 # Creation mask