From 06fbc6c541655c6d89c0722c022b7e30a85cd6d0 Mon Sep 17 00:00:00 2001
From: Petr Ruzicka <petr.ruzicka@gmail.com>
Date: Mon, 7 Aug 2017 20:03:57 +0200
Subject: build_xmr-stak_docker script improved

---
 .../build_xmr-stak_docker/build_xmr-stak_docker.sh | 57 ++++++++++++----------
 1 file changed, 31 insertions(+), 26 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh b/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh
index 905f1c8..e046cb0 100755
--- a/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh
+++ b/scripts/build_xmr-stak_docker/build_xmr-stak_docker.sh
@@ -1,30 +1,35 @@
 #!/bin/bash -uex
 
+if [[ $EUID -ne 0 ]]; then
+   echo "This script must be run as root"
+   exit 1
+fi
+
 if [ -d xmr-stak-cpu ]; then
-  sudo git -C xmr-stak-cpu clean -f
+  git -C xmr-stak-cpu clean -fd
 else
-  sudo git clone https://github.com/fireice-uk/xmr-stak-cpu.git
+  git clone https://github.com/fireice-uk/xmr-stak-cpu.git
 fi
 
 
 ########################
-# Fedora (latest)
+# Fedora 26
 ########################
-sudo docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu fedora:latest /bin/bash -c "
+docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu fedora:26 /bin/bash -c "
 set -ex ;
 dnf install -y -q gcc gcc-c++ hwloc-devel libmicrohttpd-devel libstdc++-static make openssl-devel cmake ;
 cd /xmr-stak-cpu ;
 cmake -DCMAKE_LINK_STATIC=ON . ;
 make install ;
 "
-sudo mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_fedora_latest
-sudo git -C xmr-stak-cpu clean -f
-exit
+mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_fedora_26
+git -C xmr-stak-cpu clean -fd
+
 
 ########################
-# Ubuntu (latest)
+# Ubuntu (17.04)
 ########################
-sudo docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:latest /bin/bash -c "
+docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:17.04 /bin/bash -c "
 set -ex ;
 apt update -qq ;
 apt install -y -qq libmicrohttpd-dev libssl-dev cmake build-essential libhwloc-dev ;
@@ -32,14 +37,14 @@ cd /xmr-stak-cpu ;
 cmake -DCMAKE_LINK_STATIC=ON . ;
 make install ;
 "
-sudo mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_latest
-sudo git -C xmr-stak-cpu clean -f
+mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_17.04
+git -C xmr-stak-cpu clean -fd
 
 
 ########################
 # Ubuntu 16.04
 ########################
-sudo docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:16.04 /bin/bash -c "
+docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:16.04 /bin/bash -c "
 set -ex ;
 apt update -qq ;
 apt install -y -qq libmicrohttpd-dev libssl-dev cmake build-essential libhwloc-dev ;
@@ -47,14 +52,14 @@ cd /xmr-stak-cpu ;
 cmake -DCMAKE_LINK_STATIC=ON . ;
 make install ;
 "
-sudo mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_1604
-sudo git -C xmr-stak-cpu clean -f
+mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_16.04
+git -C xmr-stak-cpu clean -fd
 
 
 ########################
 # Ubuntu 14.04
 ########################
-sudo docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:14.04 /bin/bash -c "
+docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu ubuntu:14.04 /bin/bash -c "
 set -ex ;
 apt update -qq ;
 apt install -y -qq curl libmicrohttpd-dev libssl-dev libhwloc-dev software-properties-common ;
@@ -63,20 +68,20 @@ apt update -qq ;
 apt install -y -qq gcc-7 g++-7 make ;
 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 --slave /usr/bin/g++ g++ /usr/bin/g++-7 ;
 curl -L https://cmake.org/files/v3.9/cmake-3.9.0.tar.gz | tar -xzf - -C /tmp/ ;
-cd /tmp/cmake-3.9.0/ && ./configure && make && sudo make install && cd - ;
+( cd /tmp/cmake-3.9.0/ && ./configure && make && sudo make install && cd - ) > /dev/null
 update-alternatives --install /usr/bin/cmake cmake /usr/local/bin/cmake 1 --force ;
 cd /xmr-stak-cpu ;
 cmake -DCMAKE_LINK_STATIC=ON . ;
 make install ;
 "
-sudo mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_1404
-sudo git -C xmr-stak-cpu clean -f
+mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_ubuntu_14.04
+git -C xmr-stak-cpu clean -fd
 
 
 ########################
-# CentOS (latest)
+# CentOS 7
 ########################
-sudo docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu centos:latest /bin/bash -c "
+docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu centos:7 /bin/bash -c "
 set -ex ;
 yum install -y -q centos-release-scl epel-release ;
 yum install -y -q cmake3 devtoolset-4-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ;
@@ -86,14 +91,14 @@ cmake3 -DCMAKE_LINK_STATIC=ON . ;
 make install ;
 EOF
 "
-sudo mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_centos_latest
-sudo git -C xmr-stak-cpu clean -f
+mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_centos_7
+git -C xmr-stak-cpu clean -fd
 
 
 ########################
 # CentOS 6.x
 ########################
-sudo docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu centos:6 /bin/bash -c "
+docker run --rm -it -v $PWD/xmr-stak-cpu:/xmr-stak-cpu centos:6 /bin/bash -c "
 set -ex ;
 yum install -y -q centos-release-scl epel-release ;
 yum install -y -q cmake3 devtoolset-4-gcc* hwloc-devel libmicrohttpd-devel openssl-devel make ;
@@ -103,7 +108,7 @@ cmake3 -DCMAKE_LINK_STATIC=ON . ;
 make install ;
 EOF
 "
-sudo mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_centos_6
-sudo git -C xmr-stak-cpu clean -f
+mv xmr-stak-cpu/bin/xmr-stak-cpu xmr-stak-cpu_centos_6
+git -C xmr-stak-cpu clean -fd
 
-sudo rm -rf xmr-stak-cpu
+rm -rf xmr-stak-cpu
-- 
cgit v1.1