summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavor <vorgrimmlerdavid@gmx.de>2012-08-15 15:19:14 +0200
committerdavor <vorgrimmlerdavid@gmx.de>2012-08-15 15:19:14 +0200
commit56daaa7bd4543d005aad0149547ebc951d086be3 (patch)
treed315db37dcad57268132f8f43123d0b0376e9545
parent0e9e1e4344eb71e5498d3362bd5a943d680a19cc (diff)
package list updated.Fixed path to tmp dir.
-rw-r--r--debian.list1
-rw-r--r--ubuntu.list32
-rwxr-xr-xutils.sh4
3 files changed, 17 insertions, 20 deletions
diff --git a/debian.list b/debian.list
index 77a8c54..6093a9b 100644
--- a/debian.list
+++ b/debian.list
@@ -12,7 +12,6 @@ libpcre3-dev install
libreadline-dev install
libssl-dev install
libtool install
-libtool install
libyaml-dev install
ncurses-dev install
openjdk-6-jdk install
diff --git a/ubuntu.list b/ubuntu.list
index d16ee3f..f8386d2 100644
--- a/ubuntu.list
+++ b/ubuntu.list
@@ -1,25 +1,23 @@
+aptitude install
+automake install
build-essential install
cmake install
-libgsl0-dev install
-libtool install
-openjdk-6-jdk install
-r-base install
-r-base-dev install
-libpcre3-dev install
-librasqal3-dev install
-libtool install
+curl install
libglib2.0-dev install
-ncurses-dev install
-libreadline-dev install
-uuid-dev install
-libraptor1-dev install
+libgsl0-dev install
libopenbabel4 install
libopenbabel-dev install
-automake install
-libyaml-dev install
libopenssl-ruby install
+libpcre3-dev install
+libraptor1-dev install
+librasqal3-dev install
+libreadline-dev install
libssl-dev install
+libtool install
libxml2-dev install
-libssl-dev install
-curl install
-aptitude install
+libyaml-dev install
+ncurses-dev install
+openjdk-6-jdk install
+r-base-dev install
+r-base install
+uuid-dev install
diff --git a/utils.sh b/utils.sh
index 87013d9..0423786 100755
--- a/utils.sh
+++ b/utils.sh
@@ -73,8 +73,8 @@ install_ruby() {
local DIR=`pwd`
check_utils "rbenv curl make tar"
if ! $RBENV versions $RUBY_NUM_VER | grep $RUBY_NUM_VER>/dev/null 2>&1; then
- [ -d $DIR/tmp ] || mkdir -p $DIR/tmp && cd $DIR/tmp
- ([ -d $DIR/tmp/ruby-$RUBY_NUM_VER ] || $CURL $RUBY_DWL/ruby-$RUBY_NUM_VER.tar.gz 2>/dev/null | $TAR xz) && cd ruby-$RUBY_NUM_VER
+ [ -d $OT_PREFIX/tmp ] || mkdir -p $OT_PREFIX/tmp && cd $OT_PREFIX/tmp
+ ([ -d $OT_PREFIX/tmp/ruby-$RUBY_NUM_VER ] || $CURL $RUBY_DWL/ruby-$RUBY_NUM_VER.tar.gz 2>/dev/null | $TAR xz) && cd ruby-$RUBY_NUM_VER
cmd="./configure --prefix=$RUBY_DIR" && run_cmd "$cmd" "Configure"
cmd="$MAKE -j2" && run_cmd "$cmd" "Make"
cmd="$MAKE install" && run_cmd "$cmd" "Install"