ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/REPOS_ERICCA/magic/linux/instal_magic.bash
(Generate patch)

Comparing magic/linux/instal_magic.bash (file contents):
Revision 574 by francois, Mon Oct 20 16:04:31 2014 UTC vs.
Revision 865 by francois, Wed Jan 11 19:33:47 2017 UTC

# Line 14 | Line 14 | echo $(date)
14   echo ""
15   echo "MAGiC installation"
16   echo "Checking / Installing dependencies"
17 < tabdep=(gmsh gfortran python cmake cmake-curses-gui subversion libopencascade-dev libvtk5-dev g++ gcc python-dev python-numpy python-qt4 tk bison flex libblas-dev liblapack-dev)
17 > tabdep=(gmsh gfortran python cmake cmake-curses-gui subversion libvtk5-dev g++ gcc python-dev python-numpy python-qt4 tk bison flex libblas-dev liblapack-dev libmotif-dev)
18 > versionos=$(lsb_release -sr)
19 > if [ "$versionos" \< "13" ];
20 > then
21 > tabdep=( "${tabdep[@]}" "libopencascade-dev")
22 > fi
23 > if [ "$versionos" \> "13" ];
24 > then
25 > tabdep=( "${tabdep[@]}" "liboce-ocaf-dev")
26 > fi
27 > if [ "$2" == "tout" ];
28 > then
29 > tabdep=( "${tabdep[@]}" "kdevelop")
30 > if [ "$versionos" \< "15" ];
31 > then
32 > tabdep=( "${tabdep[@]}" "kdesvn")
33 > fi
34 > if [ "$versionos" \> "15" ];
35 > then
36 > tabdep=( "${tabdep[@]}" "rabbitvcs-nautilus")
37 > fi
38 > tabdep=( "${tabdep[@]}" "kile")
39 > tabdep=( "${tabdep[@]}" "doxygen")
40 > tabdep=( "${tabdep[@]}" "openssh-client")
41 > tabdep=( "${tabdep[@]}" "openssh-server")
42 > fi
43   echo "Dependance a verifier :"${#tabdep[*]}
44   for i in ${!tabdep[*]};
45   do
# Line 23 | Line 48 | dpkg -s $nomdep  >> /dev/null 2>&1
48   if [ $? == 1 ];
49   then
50   echo $nomdep...............FAIL
51 < sudo apt-get install $nomdep  
51 > sudo apt-get -y install $nomdep  
52   else
53   echo $nomdep...............ok
54   fi
# Line 54 | Line 79 | svn up
79   fi
80   cd $__DIR/magic/exe
81   cmake .. -DENABLE_NUTIL=ON -DCMAKE_BUILD_TYPE=Debug -DENABLE_TUTORIEL=ON -DENABLE_TEST=OFF
82 < make $1 $2
82 > make
83   echo "Check target"
84   cd $__DIR/magic/exe/app/mgoperation/
85   if [ -f mgoperation.exe ];
# Line 64 | Line 89 | else
89   echo "installation echouee..................FAIL"
90   fi
91   cd $__DIR
92 < ./magic/linux/instal_aster.bash $1
92 > ./instal_aster.bash $1
93   echo ""
94   echo $(date)
95   echo ""

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines