Select stable 4store version. Make upgrade.

3 files changed, 9 insertions, 5 deletions

diff --git a/4store-install b/4store-install
index 92414df..a6a02a3 100755
--- a/4store-install
+++ b/4store-install
@@ -10,11 +10,13 @@ DIR=`pwd`
 SELF=$(basename $0 -install)
 check_log $SELF
 [ "`id -u`" = "0" ] && echo "This script must not be run as root" 1>&2 && exit 1
-check_utils "git make"
+check_utils "git make tar wget"
 
 # Build
 cd $OT_PREFIX/tmp/
-([ -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")
+cmd="$WGET $FOUR_STORE_DWL" && run_cmd "$cmd" "Download"
+cmd="$TAR -xzvf $FOUR_STORE_VER.tar.gz" && run_cmd "$cmd" "Unzip"
+mv $OT_PREFIX/tmp/$FOUR_STORE_VER $OT_PREFIX/tmp/$SELF
 cd $SELF
 cmd="./autogen.sh" && run_cmd "$cmd" "Autogen"
 export FST=$OT_PREFIX/4S
diff --git a/base-install b/base-install
index 444d7f9..92e89b4 100755
--- a/base-install
+++ b/base-install
@@ -28,6 +28,7 @@ if ! cat "/etc/apt/sources.list" | grep "$REDLAND_DEB">/dev/null 2>&1; then
 fi
 
 sudo $APTITUDE update -y >/dev/null 2>&1
+sudo $APTITUDE upgrade -y >/dev/null 2>&1
 
 DISTRIB_INFO=$(cat /proc/version)
 
@@ -37,6 +38,7 @@ case "$DISTRIB_INFO" in
   *) PACK_LIST="debian.list";;
 esac
 
+sudo $APTITUDE update -y >/dev/null 2>&1
 sudo $DPKG --set-selections < "$PACK_LIST"
 sudo $APT_GET -y --force-yes -u dselect-upgrade
 
diff --git a/config.sh b/config.sh
index 97ca02f..7a540d0 100755
--- a/config.sh
+++ b/config.sh
@@ -19,10 +19,10 @@ OB_NUM_VER="2.3.1"
 RAPTOR2_NUM_VER="2.0.8"
 RASQAL_NUM_VER="0.9.29"
 RUBY_NUM_VER="1.9.3-p194"
-4STORE_NUM_VER="v1.1.5"
+FOUR_STORE_VER="4store-v1.1.5"
 REDLAND_DWL="http://download.librdf.org"
 REDLAND_APT_KEY="http://purl.org/net/dajobe/gnupg.asc"
-4STORE_URL="http://4store.org/download"
+FOUR_STORE_URL="http://4store.org/download"
 
 # Done.
 
@@ -47,4 +47,4 @@ RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/1.9"
 RAPTOR2_DWL="$REDLAND_DWL/source/$RAPTOR2_VER.tar.gz"
 RASQAL_DWL="$REDLAND_DWL/source/$RASQAL_VER.tar.gz"
 REDLAND_DEB="$REDLAND_DWL/binaries/$OT_DIST/unstable"
-4STORE_DWL="$4STORE_URL/4store-$4STORE_NUM_VER.tar.gz"
\ No newline at end of file
+FOUR_STORE_DWL="$FOUR_STORE_URL/$FOUR_STORE_VER.tar.gz"