summaryrefslogtreecommitdiff
path: root/install
diff options
context:
space:
mode:
authormanojgudi2013-10-14 12:53:18 +0530
committermanojgudi2013-10-14 12:53:18 +0530
commit1b865e2058eae46e4619ce9117f8e0da918fe467 (patch)
tree666dc7dd3d5249929dfa1d75521fed33f57765f4 /install
parent3eb54dce6db2c7d83ff593b5cd514708ed8231eb (diff)
parent937270f396cdda860081bf65cfe023da03d397ed (diff)
downloadsciscipy-1.0.0-1b865e2058eae46e4619ce9117f8e0da918fe467.tar.gz
sciscipy-1.0.0-1b865e2058eae46e4619ce9117f8e0da918fe467.tar.bz2
sciscipy-1.0.0-1b865e2058eae46e4619ce9117f8e0da918fe467.zip
resolved merge conflict
Diffstat (limited to 'install')
-rwxr-xr-x[-rw-r--r--]install18
1 files changed, 11 insertions, 7 deletions
diff --git a/install b/install
index 013f2aa..548aaf6 100644..100755
--- a/install
+++ b/install
@@ -26,15 +26,19 @@ sudo ./setup.py install --install-layout=deb
echo "$bold $red Setting up variables $end"
s2pconf=/etc/ld.so.conf.d/sciscipy.conf
- echo "/usr/lib/scilab" >> $s2pconf
- echo "/usr/lib/jvm/default-java/jre/lib/$platform/native_threads" >> $s2pconf
- echo "/usr/lib/jvm/default-java/jre/lib/$platform/" >> $s2pconf
- echo "/usr/lib/jvm-/efault-java/jre/lib/$platform/server" >> $s2pconf
+ # Remove existing sciscipy.conf
+ sudo rm $s2pconf
- env=/etc/environment
- echo 'PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' >> env
- echo 'SCI=/usr/share/scilab' >> env
+ sudo bash -c "echo '/usr/lib/scilab' >> $s2pconf"
+ sudo bash -c "echo '/usr/lib/jvm/default-java/jre/lib/$platform/native_threads' >> $s2pconf"
+ sudo bash -c "echo '/usr/lib/jvm/default-java/jre/lib/$platform/' >> $s2pconf"
+ sudo bash -c "echo '/usr/lib/jvm-/efault-java/jre/lib/$platform/server' >> $s2pconf"
+ env=/etc/environment
+ sudo bash -c "echo 'export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games' >> $env"
+ sudo bash -c "echo 'export SCI=/usr/share/scilab' >> $env"
+ sudo bash -c "echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/scilab:/usr/lib/jvm/java-6-openjdk-$platform/jre/lib/$platform/server/:/usr/lib/jvm/java-6-openjdk/jre/lib/$platform/native_threads/:/usr/local/lib' >> $env"
+ source $env
# Testing
echo "$bold $red Testing... $end"
CURRENT_PATH=`pwd`