summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2015-05-08 17:15:24 +0200
committergebele <gebele@in-silico.ch>2015-05-08 17:15:24 +0200
commit38a690d2255dd99975e86352fa05c53e9d85b5c7 (patch)
tree830b29617d9f91782f9b32efa83224ebd9c0164c
parent7b319e92329bcda449c89c8e4202b7eb81472bd3 (diff)
Revert "fixed 4store version 1.1.5"
This reverts commit 7b319e92329bcda449c89c8e4202b7eb81472bd3.
-rwxr-xr-x4store-install9
1 files changed, 4 insertions, 5 deletions
diff --git a/4store-install b/4store-install
index c343d4f..4f70582 100755
--- a/4store-install
+++ b/4store-install
@@ -14,12 +14,11 @@ check_utils "git make tar wget"
# Build
cd $OT_PREFIX/tmp/
-cmd="$WGET $FOUR_STORE_URL/$FOUR_STORE_VER.tar.gz" && run_cmd "$cmd" "Download"
-export FST=$OT_PREFIX/4S
-cmd="$TAR xvzf $FOUR_STORE_VER.tar.gz" && run_cmd "$cmd" "Unpack"
-rm $FOUR_STORE_VER.tar.gz
-cd $FOUR_STORE_VER
+([ -d $SELF ] && cd $SELF && cmd="$GIT pull" && run_cmd "$cmd" "Git pull") || (cmd="$GIT clone https://github.com/garlik/$SELF" && run_cmd "$cmd" "Git clone")
+cd $SELF
+#cmd="$GIT checkout -b ist c3d8593c39dc04a39e272f729e486c1576f6aeba" && run_cmd "$cmd" "checkout to particular commit"
cmd="./autogen.sh" && run_cmd "$cmd" "Autogen"
+export FST=$OT_PREFIX/4S
cmd="./configure --enable-dedup-insert --prefix=$FST --exec-prefix=$FST --with-storage-path=$FST/var/lib --with-config-file=$FST/$SELF.conf -with-http-log=$FST/log CFLAGS=-O2 CPPFLAGS=-O3" && run_cmd "$cmd" "Configure"
cmd="make" && run_cmd "$cmd" "Make"
cmd="make install" && run_cmd "$cmd" "Make Install"