--- STHbench-Dev006.sh 2013-12-24 14:23:29.982863453 +0100
+++ STHbench-Dev006.sh.new 2013-12-25 13:25:55.917188997 +0100
@@ -11,13 +11,19 @@
#############Set Functions################
+NEED_PTS=1
+
# Update and install required packages (Debian)
Update_Install_Debian()
{
apt-get -y update && apt-get -y upgrade && apt-get install -f
-apt-get -y install build-essential libx11-dev libglu-dev hardinfo crafty sysbench expect make gcc php5-curl php5-common php5-cli php5-gd libfpdi-php
+apt-get -y install build-essential libx11-dev libglu-dev hardinfo sysbench expect php5-curl php5-common php5-cli php5-gd libfpdi-php
apt-get install -f
-wget -N http://phoronix-test-suite.com/releases/repo/pts.debian/files/phoronix-test-suite_4.8.6_all.deb && dpkg -i phoronix-test-suite_4.8.6_all.deb
+dpkg -s phoronix-test-suite 2>&1 > /dev/null 2>&1
+NEED_PTS=$(echo $?)
+if [ $NEED_PTS > 0 ]; then
+ wget -N http://phoronix-test-suite.com/releases/repo/pts.debian/files/phoronix-test-suite_4.8.6_all.deb && dpkg -i phoronix-test-suite_4.8.6_all.deb
+fi
}
# Update and install required packages (CentOS/RHEL)
Update_Install_RHEL()
@@ -96,11 +102,6 @@
# C-Ray 1.1
wget -N http://www.futuretech.blinkenlights.nl/depot/c-ray-1.1.tar.gz && tar -zxf c-ray-1.1.tar.gz && cd c-ray-1.1 && make && cat scene | ./c-ray-mt -t 32 -s 7500x3500 > foo.ppm | tee c-ray1.txt && cat sphfract | ./c-ray-mt -t 32 -s 1920x1200 -r 8 > foo.ppm && cd ..
-# Crafty
-if [[ $DIST = "Debian" ]]; then
-/usr/games/crafty 'log off' bench end
-fi
-
# Phoroncrix Test Suite
expect <<EOD
set timeout -1
@@ -133,9 +134,6 @@
cp utils/redis_init_script /etc/init.d/redis_6379
[[ -d /var/redis ]] || ( mkdir /var/redis && mkdir /var/redis/6379 )
-cd src
-cp redis-server redis-cli redis-benchmark /usr/local/bin/
-
service redis_6379 start
# Original redis benchmark set/ get test
@@ -165,4 +163,30 @@
redis-cli shutdown
+cd ..
+
+# Remove Redis
+rm -rf /etc/redis
+rm -f /etc/init.d/redis_6379
+rm -rf /var/redis
+rm -f /usr/local/bin/redis-benchmark
+rm -f /usr/local/bin/redis-check-aof
+rm -f /usr/local/bin/redis-check-dump
+rm -f /usr/local/bin/redis-cli
+rm -f /usr/local/bin/redis-server
+rm -f redis-stable.tar.gz
+rm -rf redis-stable
+
+# Remove c-ray
+rm -f c-ray-1.1.tar.gz
+rm -rf c-ray-1.1
+
+# Remove UnixBench5.1.3.tgz
+rm -f UnixBench5.1.3.tgz
+rm -rf UnixBench
+
+# Remove Phoronix test suite
+[ "$NEED_PTS" > "0" -a "$DIST" = "Debian" ] && apt-get -y --purge remove phoronix-test-suite && rm -f phoronix-test-suite_4.8.6_all.deb
+
cd ~/
+