You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@predictionio.apache.org by em...@apache.org on 2016/08/17 19:46:10 UTC
[2/3] incubator-predictionio git commit: [PIO-22] [PIO-10] closes
apache/incubator-predictionio#277 fix source tar naming,
fix new install options, remove email submission
[PIO-22] [PIO-10] closes apache/incubator-predictionio#277 fix source tar naming, fix new install options, remove email submission
Project: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/commit/b5023579
Tree: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/tree/b5023579
Diff: http://git-wip-us.apache.org/repos/asf/incubator-predictionio/diff/b5023579
Branch: refs/heads/develop
Commit: b50235793f4a3cc4363c5a29d6bf1d1ede4d1250
Parents: 8bfe974
Author: EmergentOrder <le...@gmail.com>
Authored: Wed Aug 17 13:43:36 2016 -0600
Committer: EmergentOrder <le...@gmail.com>
Committed: Wed Aug 17 13:43:36 2016 -0600
----------------------------------------------------------------------
bin/install.sh | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-predictionio/blob/b5023579/bin/install.sh
----------------------------------------------------------------------
diff --git a/bin/install.sh b/bin/install.sh
index f5bd732..44c6975 100755
--- a/bin/install.sh
+++ b/bin/install.sh
@@ -137,7 +137,7 @@ elif [[ "$1" == "-y" ]]; then
# todo: make java installation platform independent
sudo apt-get update
- sudo apt-get install openjdk-7-jdk libgfortran3 python-pip -y
+ sudo apt-get install openjdk-8-jdk libgfortran3 python-pip -y
sudo pip install predictionio
echo -e "\033[1;32mJava install done!\033[0m"
@@ -173,24 +173,6 @@ else
esac
done
- if confirm "Receive updates?"; then
- guess_email=''
- if hash git 2>/dev/null; then
- # Git installed!
- guess_email=$(git config --global user.email)
- fi
-
- if [ -n "${guess_email}" ]; then
- read -e -p "Email (${guess_email}): " email
- else
- read -e -p "Enter email: " email
- fi
- email=${email:-$guess_email}
-
- url="https://direct.prediction.io/$PIO_VERSION/install.json/install/install/$email/"
- curl --silent ${url} > /dev/null
- fi
-
spark_dir=${vendors_dir}/spark-${SPARK_VERSION}
elasticsearch_dir=${vendors_dir}/elasticsearch-${ELASTICSEARCH_VERSION}
hbase_dir=${vendors_dir}/hbase-${HBASE_VERSION}
@@ -252,7 +234,7 @@ else
echo -e "\033[33mYou will be prompted for your password by sudo:\033[0m"
sudo apt-get update
- sudo apt-get install openjdk-7-jdk libgfortran3 python-pip -y
+ sudo apt-get install openjdk-8-jdk libgfortran3 python-pip -y
sudo pip install predictionio
echo -e "\033[1;32mJava install done!\033[0m"
@@ -356,8 +338,6 @@ installPGSQL () {
curl -O https://jdbc.postgresql.org/download/postgresql-${POSTGRES_VERSION}.jar
mv postgresql-${POSTGRES_VERSION}.jar ${PIO_DIR}/lib/
- echo "Updating: $pio_dir/conf/pio-env.sh"
- ${SED_CMD} "s|PIO_STORAGE_REPOSITORIES_METADATA_SOURCE=PGSQL|PIO_STORAGE_REPOSITORIES_METADATA_SOURCE=ELASTICSEARCH|" ${pio_dir}/conf/pio-env.sh
echo -e "\033[1;32mPGSQL setup done!\033[0m"
}
@@ -384,6 +364,14 @@ case $source_setup in
"$PGSQL")
installPGSQL
;;
+ "$ES_PGSQL")
+ installES
+ installPGSQL
+ echo "Updating: $pio_dir/conf/pio-env.sh"
+ ${SED_CMD} "s|PIO_STORAGE_REPOSITORIES_METADATA_SOURCE=PGSQL|PIO_STORAGE_REPOSITORIES_METADATA_SOURCE=ELASTICSEARCH|" ${pio_dir}/conf/pio-env.sh
+ ${SED_CMD} "s|# PIO_STORAGE_SOURCES_ELASTICSEARCH_TYPE|PIO_STORAGE_SOURCES_ELASTICSEARCH_TYPE|" ${pio_dir}/conf/pio-env.sh
+ ${SED_CMD} "s|# PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=.*|PIO_STORAGE_SOURCES_ELASTICSEARCH_HOME=$elasticsearch_dir|" ${pio_dir}/conf/pio-env.sh
+ ;;
"$MYSQL")
if [[ ${distribution} = "$DISTRO_DEBIAN" ]]; then
echo -e "\033[1;36mInstalling MySQL...\033[0m"