remove unsupported platforms from README and build scripts

README.md

@@ -42,17 +42,17 @@ $ brew install eosio
 $ brew remove eosio
 ```
 
-#### Ubuntu 18.04 Debian Package Install
+#### Ubuntu 18.04 Package Install
 ```sh
 $ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio_1.7.0-rc1-ubuntu-18.04_amd64.deb
 $ sudo apt install ./eosio_1.7.0-rc1-ubuntu-18.04_amd64.deb
 ```
-#### Ubuntu 16.04 Debian Package Install
+#### Ubuntu 16.04 Package Install
 ```sh
 $ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio_1.7.0-rc1-ubuntu-16.04_amd64.deb
 $ sudo apt install ./eosio_1.7.0-rc1-ubuntu-16.04_amd64.deb
 ```
-#### Debian Package Uninstall
+#### Ubuntu Package Uninstall
 ```sh
 $ sudo apt remove eosio
 ```
@@ -65,15 +65,6 @@ $ sudo yum install ./eosio-1.7.0-rc1.el7.x86_64.rpm
 ```sh
 $ sudo yum remove eosio
 ```
-#### Fedora RPM Package Install
-```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.6.0/eosio-1.7.0-rc1.fc27.x86_64.rpm
-$ sudo yum install ./eosio-1.7.0-rc1.fc27.x86_64.rpm
-```
-#### Fedora RPM Package Uninstall
-```sh
-$ sudo yum remove eosio.cdt
-```
 
 #### Build Script Uninstall
 
@@ -84,13 +75,11 @@ If you have previously installed EOSIO using build scripts, you have two options
 
 ## Supported Operating Systems
 EOSIO currently supports the following operating systems:  
-1. Amazon 2017.09 and higher
-2. Centos 7
-3. Fedora 25 and higher (Fedora 27 recommended)
-4. Mint 18
-5. Ubuntu 16.04 (Ubuntu 16.10 recommended)
-6. Ubuntu 18.04
-7. MacOS Darwin 10.12 and higher (MacOS 10.13.x recommended)
+1. Amazon Linux 2
+2. CentOS 7
+3. Ubuntu 16.04
+4. Ubuntu 18.04
+5. MacOS 10.14 (Mojave)
 
 ## Resources
 1. [Website](https://eos.io)

scripts/eosio_build.sh

@@ -272,7 +272,7 @@ fi
 CXX=$CPP_COMP
 CC=$CC_COMP
 
-export PIN_COMPILER=$PIN_COMPILER 
+export PIN_COMPILER=$PIN_COMPILER
 
 # Setup directories
 mkdir -p $SRC_LOCATION
@@ -296,21 +296,23 @@ printf "\\nARCHITECTURE: %s\\n" "${ARCH}"
 # Find and use existing CMAKE
 export CMAKE=$(command -v cmake 2>/dev/null)
 
+print_supported_linux_distros_and_exit() {
+   printf "\\nOn Linux the EOSIO build script only supports Amazon, Centos, and Ubuntu.\\n"
+   printf "Please install on a supported version of one of these Linux distributions.\\n"
+   printf "https://aws.amazon.com/amazon-linux-ami/\\n"
+   printf "https://www.centos.org/\\n"
+   printf "https://www.ubuntu.com/\\n"
+   printf "Exiting now.\\n"
+   exit 1
+}
+
 if [ "$ARCH" == "Linux" ]; then
    # Check if cmake is already installed or not and use source install location
    if [ -z $CMAKE ]; then export CMAKE=$PREFIX/bin/cmake; fi
    export OS_NAME=$( cat /etc/os-release | grep ^NAME | cut -d'=' -f2 | sed 's/\"//gI' )
    OPENSSL_ROOT_DIR=/usr/include/openssl
    if [ ! -e /etc/os-release ]; then
-      printf "\\nEOSIO currently supports Amazon, Centos, Fedora, Mint & Ubuntu Linux only.\\n"
-      printf "Please install on the latest version of one of these Linux distributions.\\n"
-      printf "https://aws.amazon.com/amazon-linux-ami/\\n"
-      printf "https://www.centos.org/\\n"
-      printf "https://start.fedoraproject.org/\\n"
-      printf "https://linuxmint.com/\\n"
-      printf "https://www.ubuntu.com/\\n"
-      printf "Exiting now.\\n"
-      exit 1
+      print_supported_linux_distros_and_exit
    fi
    case "$OS_NAME" in
       "Amazon Linux AMI"|"Amazon Linux")
@@ -319,25 +321,11 @@ if [ "$ARCH" == "Linux" ]; then
       "CentOS Linux")
          FILE="${REPO_ROOT}/scripts/eosio_build_centos.sh"
       ;;
-      "elementary OS")
-         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.sh"
-      ;;
-      "Fedora")
-         export CPATH=/usr/include/llvm4.0:$CPATH # llvm4.0 for fedora package path inclusion
-         FILE="${REPO_ROOT}/scripts/eosio_build_fedora.sh"
-      ;;
-      "Linux Mint")
-         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.sh"
-      ;;
       "Ubuntu")
          FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.sh"
       ;;
-      "Debian GNU/Linux")
-         FILE="${REPO_ROOT}/scripts/eosio_build_ubuntu.sh"
-      ;;
       *)
-         printf "\\nUnsupported Linux Distribution. Exiting now.\\n\\n"
-         exit 1
+         print_supported_linux_distros_and_exit
    esac
 fi
 

scripts/eosio_build_amazon.sh

@@ -8,28 +8,18 @@ DISK_AVAIL_KB=$( df . | tail -1 | awk '{print $4}' )
 DISK_TOTAL=$(( DISK_TOTAL_KB / 1048576 ))
 DISK_AVAIL=$(( DISK_AVAIL_KB / 1048576 ))
 
-PINNED_TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE=$BUILD_DIR/pinned_toolchain.cmake
-
-if [[ "${OS_NAME}" == "Amazon Linux AMI" ]]; then # Amazonlinux1
-	DEP_ARRAY=(
-		sudo procps util-linux which gcc72 gcc72-c++ autoconf automake libtool make doxygen graphviz \
-		bzip2 bzip2-devel openssl-devel gmp gmp-devel libstdc++72 python27 python27-devel python36 python36-devel \
-		libedit-devel ncurses-devel swig curl file libcurl-devel libusb1-devel
-	)
-else # Amazonlinux2
-	DEP_ARRAY=(
-		git procps-ng util-linux gcc gcc-c++ autoconf automake libtool make bzip2 \
-		bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel libusbx-devel \
-		python3 python3-devel python-devel libedit-devel doxygen graphviz
-	)
-fi
+DEP_ARRAY=(
+	git procps-ng util-linux gcc gcc-c++ autoconf automake libtool make bzip2 \
+	bzip2-devel openssl-devel gmp-devel libstdc++ libcurl-devel libusbx-devel \
+	python3 python3-devel python-devel libedit-devel doxygen graphviz
+)
 
 COUNT=1
 DISPLAY=""
 DEP=""
 
-if [[ "${OS_NAME}" == "Amazon Linux AMI" && "${OS_VER}" -lt 2017 ]]; then
-	printf "You must be running Amazon Linux 2017.09 or higher to install EOSIO.\\n"
+if ! (. /etc/os-release; [ "$VERSION_ID" = "2" ]); then
+	printf "Amazon Linux 2 is the only version of Amazon Linux supported by EOSIO build scripts.\\n"
 	printf "exiting now.\\n"
 	exit 1
 fi
@@ -241,7 +231,7 @@ if [ $PIN_COMPILER ]; then
       printf " - Boost library found with correct version @ ${BOOST_ROOT} (Symlinked to ${BOOST_LINK_LOCATION}).\\n"
    fi
    if [ $? -ne 0 ]; then exit -1; fi
-   
+
    printf "\\n"
 else
    printf "Checking Boost library (${BOOST_VERSION}) installation...\\n"
@@ -267,7 +257,7 @@ else
 
    printf "\\n"
 
-   if [ $BUILD_MONGO ]; then 
+   if [ $BUILD_MONGO ]; then
       printf "Checking MongoDB installation...\\n"
       if [ ! -d $MONGODB_ROOT ] || [ $FORCE_BUILD ]; then
          printf "Installing MongoDB into ${MONGODB_ROOT}...\\n"

scripts/eosio_build_centos.sh

@@ -33,8 +33,8 @@ if [ "${MEM_MEG}" -lt 7000 ]; then
 	exit 1;
 fi
 
-if [ "${OS_VER}" -lt 7 ]; then
-	printf "\\nYou must be running Centos 7 or higher to install EOSIO.\\n"
+if ! (. /etc/os-release; [ "$VERSION_ID" = "7" ]); then
+	printf "\\nCentos 7 is the only version of Centos supported by EOSIO build scripts.\\n"
 	printf "Exiting now.\\n\\n"
 	exit 1;
 fi