Merge pull request #1276 from mnordsletten/dependency_classes

Improvements to dependency installation

Author: fwsGonzo

etc/install_build_requirements.sh

@@ -1,35 +1,105 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Install dependencies
 
-SYSTEM=$1
-RELEASE=$2
+############################################################
+# OPTIONS:
+############################################################
 
-DEPENDENCIES="curl make clang cmake nasm bridge-utils qemu jq python-jsonschema python-psutil"
+BUILD_DEPENDENCIES="curl make clang cmake nasm bridge-utils qemu jq python-jsonschema python-psutil"
+TEST_DEPENDENCIES="g++ g++-multilib python-junit.xml"
+
+############################################################
+# COMMAND LINE PROPERTIES:
+############################################################
+
+# Initialize variables:
+SYSTEM=0
+RELEASE=0
+CHECK_ONLY=0
+PRINT_INSTALL_STATUS=0
+DEPENDENCIES_TO_INSTALL=build
+
+while getopts "h?s:r:cpd:" opt; do
+    case "$opt" in
+    h|\?)
+        printf "%s\n" "Options:"\
+                "-s System: What system to install on"\
+                "-r Release: What release of said system"\
+				"-c Only check: Will only check what packages are needed (will always print status as well)"\
+                "-p Print install status: Flag for wheter or not to print dependency status"\
+                "-d Dependencies to install: [build | test | all] are the options"
+        exit 0 ;;
+	s)  SYSTEM=$OPTARG ;;
+	r)  RELEASE=$OPTARG ;;
+    c)  CHECK_ONLY=1 ; PRINT_INSTALL_STATUS=1;;
+	p)  PRINT_INSTALL_STATUS=1 ;;
+	d)  DEPENDENCIES_TO_INSTALL=$OPTARG ;;
+    esac
+done
+
+# Figure out which dependencies to check
+case "$DEPENDENCIES_TO_INSTALL" in
+	build) ALL_DEPENDENCIES=$BUILD_DEPENDENCIES ;;
+	test) ALL_DEPENDENCIES=$TEST_DEPENDENCIES ;;
+	all) ALL_DEPENDENCIES="$BUILD_DEPENDENCIES $TEST_DEPENDENCIES" ;;
+esac
+
+############################################################
+# CHECK INSTALLED PACKAGES:
+############################################################
+
+if [ $PRINT_INSTALL_STATUS -eq 1 ]; then
+	printf "%-15s %-20s %s \n"\
+		   "Status" "Package" "Version"\
+		   "------" "-------" "-------"
+	for package in $ALL_DEPENDENCIES; do
+		dpkg-query -W $package > /dev/null 2>&1
+		if [ $? -eq 0 ]; then
+			printf '\e[32m%-15s\e[0m %-20s %s \n'\
+				"INSTALLED" $(dpkg-query -W $package)
+		else
+			printf '\e[31m%-15s\e[0m %-20s %s \n'\
+				"MISSING" $package
+			DEPENDENCIES="$DEPENDENCIES $package"
+		fi
+	done
+	# Exits if CHECK_ONLY is set, exit code 1 if there are packages to install
+	if [ $CHECK_ONLY -eq 1 ]; then
+		if [ -z "$DEPENDENCIES" ]; then
+			exit 0
+		else
+			exit 1
+		fi
+	fi
+else
+	DEPENDENCIES=$ALL_DEPENDENCIES
+fi
+
+############################################################
+# INSTALL MISSING PACKAGES:
+############################################################
 
 case $SYSTEM in
     "Darwin")
         exit 0;
         ;;
     "Linux")
-		echo ">>> Installing dependencies (requires sudo):"
+		echo ">>> Installing missing dependencies (requires sudo):"
         case $RELEASE in
             "debian"|"ubuntu"|"linuxmint")
                 DEPENDENCIES="$DEPENDENCIES"
-                echo "    Packages: $DEPENDENCIES"
                 sudo apt-get -qq update || exit 1
                 sudo apt-get -qqy install $DEPENDENCIES > /dev/null || exit 1
                 exit 0;
                 ;;
             "fedora")
                 DEPENDENCIES="$DEPENDENCIES"
-                echo "    Packages: $DEPENDENCIES"
                 sudo dnf install $DEPENDENCIES || exit 1
                 exit 0;
                 ;;
             "arch")
                 DEPENDENCIES="$DEPENDENCIES python2 python2-jsonschema python2-psutil"
-                echo "    Packages: $DEPENDENCIES"
                 sudo pacman -Syyu
                 sudo pacman -S --needed $DEPENDENCIES
                 exit 0;

install.sh

@@ -113,10 +113,15 @@ if [ "Darwin" = "$SYSTEM" ]; then
 		exit 1
 	fi
 else
-	if ! ./etc/install_build_requirements.sh $SYSTEM $RELEASE; then
-		printf "%s\n" ">>> Sorry <<<"\
-			   "Could not install build requirements."
-		exit 1
+	# Will only check if build dependencies are installed at this point
+	if [ $INCLUDEOS_ENABLE_TEST == "ON" ]; then
+		dependency_level=all
+	else
+		dependency_level=build
+	fi	
+	echo ">>> Dependencies required:"
+	if ! ./etc/install_build_requirements.sh -s $SYSTEM -r $RELEASE -c -d $dependency_level; then
+		missing_dependencies=1
 	fi
 fi
 
@@ -147,6 +152,9 @@ done
 
 # Print currently set install options
 printf "\n\n>>> IncludeOS will be installed with the following options:\n\n"
+if [ ! -z $missing_dependencies ]; then
+	printf '    \e[31m%-s\e[0m %-s\n\n' "[NOTICE]" "Missing dependencies will be installed"
+fi
 printf "    %-25s %-25s %s\n"\
 	   "Env variable" "Description" "Value"\
 	   "------------" "-----------" "-----"\
@@ -168,6 +176,15 @@ if tty -s && [ $install_yes -eq 0 ]; then
 	esac
 fi
 
+# Install dependencies if there are any missing
+if [ ! -z $missing_dependencies ]; then
+	if ! ./etc/install_build_requirements.sh -s $SYSTEM -r $RELEASE -d $dependency_level; then
+		printf "%s\n" ">>> Sorry <<<"\
+				"Could not install dependencies"
+		exit 1
+	fi
+fi
+
 # Trap that cleans the cmake output file in case of exit
 function clean {
 	if [ -f /tmp/cmake_output.txt ]; then