From 0aaa73d083c3c6310ade5f86f903bfd0c78094af Mon Sep 17 00:00:00 2001
From: cubedro <contact@siteshop.ro>
Date: Fri, 3 Apr 2015 08:30:51 +0300
Subject: [PATCH] updated build.sh

---
 bin/build.sh   | 40 +++++++++-------------------------------
 processes.json |  3 +--
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/bin/build.sh b/bin/build.sh
index 04d6ea4..9913fac 100644
--- a/bin/build.sh
+++ b/bin/build.sh
@@ -2,49 +2,27 @@
 
 cd ~
 
+
+mkdir bin
+mkdir logs
+
 # let's install packages
 sudo apt-get -y update
-sudo apt-get -y install language-pack-en-base
-sudo dpkg-reconfigure locales
-wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-sudo add-apt-repository "deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.5-binaries main"
+sudo apt-get -y upgrade
 
 # Setup Ethereum repos
 sudo add-apt-repository -y ppa:ethereum/ethereum
 sudo add-apt-repository -y ppa:ethereum/ethereum-dev
 sudo apt-get -y update
-sudo apt-get -y upgrade
 
-sudo apt-get -y install software-properties-common build-essential g++-4.8 git cmake libboost-all-dev automake unzip libgmp-dev libtool libleveldb-dev yasm libminiupnpc-dev libreadline-dev scons libncurses5-dev libcurl4-openssl-dev wget qtbase5-dev qt5-default qtdeclarative5-dev libqt5webkit5-dev libcryptopp-dev libjson-rpc-cpp-dev libmicrohttpd-dev libjsoncpp-dev libargtable2-dev clang-3.5 lldb-3.5 nodejs npm ntp
+sudo apt-get -y install software-properties-common build-essential git unzip wget nodejs npm ntp cloud-utils eth
+
+# add eth symlink
+ln -s /usr/bin/eth ~/bin/eth
 
 # add node symlink
 sudo ln -s /usr/bin/nodejs /usr/bin/node
 
-# create directories structure
-[ ! -d "ethereum" ] && mkdir ethereum # ethereum dir maybe mapped from host machine
-mkdir opt
-mkdir bin
-mkdir logs
-
-# download cpp-ethereum if needed
-cd ethereum
-[ ! -d "cpp-ethereum" ] && git clone --depth=1 --branch develop https://github.com/ethereum/cpp-ethereum
-
-# build ethereum
-cd ~/opt
-mkdir cpp-ethereum-build
-cd cpp-ethereum-build
-cmake ~/ethereum/cpp-ethereum -DHEADLESS=1 -DCMAKE_BUILD_TYPE=Debug
-# cmake ~/ethereum/cpp-ethereum -DHEADLESS=1 -DEVMJIT=1 -DCMAKE_BUILD_TYPE=Debug
-make -j2
-
-# now let's create bin folder in user's home dir and create symlinks to executables
-cd ~
-ln -s ~/opt/cpp-ethereum-build/eth/eth ~/bin/eth
-
-# install cloud-utils to fetch instance meta-data
-sudo apt-get -y install cloud-utils
-
 # add node service
 cd ~/bin
 
diff --git a/processes.json b/processes.json
index 875130f..29a9dad 100644
--- a/processes.json
+++ b/processes.json
@@ -9,7 +9,6 @@
 		"error_file"				: "/home/ubuntu/logs/eth-err.log",
 		"merge_logs"				: false,
 		"watch"						: false,
-		"cron_restart"				: "0 0 * * *",
 		"exec_interpreter"			: "bash",
 		"exec_mode"					: "fork_mode"
 	},
@@ -20,7 +19,7 @@
 		"log_file"					: "/home/ubuntu/logs/node-app-log.log",
 		"out_file"					: "/home/ubuntu/logs/node-app-out.log",
 		"error_file"				: "/home/ubuntu/logs/node-app-err.log",
-		"merge_logs"				: true,
+		"merge_logs"				: false,
 		"watch"						: false,
 		"exec_interpreter"			: "node",
 		"exec_mode"					: "fork_mode",