Bugfixes in DCTuser_setup.sh

git-svn-id: https://svn.code.sf.net/p/dct/code/trunk@622 4c865b51-4357-4376-afb4-474e03ccb993

DCTuser_setup.sh

@@ -9,7 +9,7 @@ export CPU=`/csadmin/common/scripts/get_arch`
 [ `which python26` ] && PYTHON_EXE=python26 || PYTHON_EXE=python
 PYTHON_VER_MAJOR=`$PYTHON_EXE -V 2>&1 | sed -r 's/Python ([0-9]*)\.([0-9]*)\.([0-9]*)/\1/'`
 PYTHON_VER_MINOR=`$PYTHON_EXE -V 2>&1 | sed -r 's/Python ([0-9]*)\.([0-9]*)\.([0-9]*)/\2/'`
-if [ $PYTHON_VER_MAJOR -ge 2 ] && [ $PYTHON_VER_MINOR -ge 6 ] ; then
+if [ $PYTHON_VER_MAJOR -lt 2 ] || [ $PYTHON_VER_MINOR -lt 6 ] ; then
   echo "Python version >= 2.6 is needed for setup"
   exit 1
 fi 
@@ -17,12 +17,12 @@ fi
 # Setup SVN servers
 mkdir -p ~/.subversion
 echo -n "Setup SVN servers... "
-[ $ESRF_OSTYPE ] && (grep -qE '^\s*http-proxy-host = proxy.esrf.fr' ~/.subversion/servers || echo "
+grep -qE '^\s*http-proxy-host = proxy.esrf.fr' ~/.subversion/servers || echo "
 [global]
 http-proxy-host = proxy.esrf.fr
 http-proxy-port = 3128
 store-plaintext-passwords = no
-" >> ~/.subversion/servers)
+" >> ~/.subversion/servers
 echo "Done."
 
 # Do the svn checkout
@@ -44,7 +44,7 @@ fi
 
 # Append setup lines to .bashrc_private
 echo -n "Appending to your .bashrc_private file... "
-cat ${DCT_DIR}/zUtil_Python/bashrc.example >> ~/.bashrc_private
+cat ${DCT_DIR}/zUtil_Conf/bashrc.example >> ~/.bashrc_private
 echo "Done."
 
 # Get good version of startup.m for matlab