Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 6a3faa392 -> 8ea78747e
MINIFICPP-454: Fix apt-get install statement This closes #299. Signed-off-by: Aldrin Piri <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/8ea78747 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/8ea78747 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/8ea78747 Branch: refs/heads/master Commit: 8ea78747e0d5c98adf8b1eb0e3a63c603b1f9db8 Parents: 6a3faa3 Author: Marc Parisi <[email protected]> Authored: Fri Apr 13 19:17:53 2018 +0100 Committer: Aldrin Piri <[email protected]> Committed: Mon Apr 16 14:32:07 2018 -0400 ---------------------------------------------------------------------- aptitude.sh | 5 +---- bootstrap.sh | 3 --- debian.sh | 12 +++++------- 3 files changed, 6 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8ea78747/aptitude.sh ---------------------------------------------------------------------- diff --git a/aptitude.sh b/aptitude.sh index 5e3db10..4867fa9 100644 --- a/aptitude.sh +++ b/aptitude.sh @@ -18,11 +18,7 @@ verify_enable(){ feature="$1" feature_status=${!1} - if [ "$feature" = "USB_ENABLED" ]; then - echo "false" - else echo "true" - fi } add_os_flags() { CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} -DFAIL_ON_WARNINGS= " @@ -53,6 +49,7 @@ build_deps(){ elif [ "$FOUND_VALUE" = "openssl" ]; then INSTALLED+=("openssl") elif [ "$FOUND_VALUE" = "libusb" ]; then + INSTALLED+=("libusb-1.0-0-dev") INSTALLED+=("libusb-dev") elif [ "$FOUND_VALUE" = "libpng" ]; then INSTALLED+=("libpng-dev") http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8ea78747/bootstrap.sh ---------------------------------------------------------------------- diff --git a/bootstrap.sh b/bootstrap.sh index e6981d5..69c776a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -145,11 +145,9 @@ else OS=$(uname -s) VER=$(uname -r) fi - OS_MAJOR=`echo $VER | cut -d. -f1` OS_MINOR=`echo $VER | cut -d. -f2` OS_REVISION=`echo $EVR | cut -d. -f3` - if [[ "$OS" = "Darwin" ]]; then source darwin.sh elif [[ "$OS" = Deb* ]]; then @@ -230,7 +228,6 @@ add_disabled_option PCAP_ENABLED ${FALSE} "ENABLE_PCAP" add_dependency PCAP_ENABLED "libpcap" add_disabled_option USB_ENABLED ${FALSE} "ENABLE_USB_CAMERA" - add_dependency USB_ENABLED "libusb" add_dependency USB_ENABLED "libpng" http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/8ea78747/debian.sh ---------------------------------------------------------------------- diff --git a/debian.sh b/debian.sh index b2d3e2b..15672e9 100644 --- a/debian.sh +++ b/debian.sh @@ -18,11 +18,7 @@ verify_enable(){ feature="$1" feature_status=${!1} - if [ "$feature" = "USB_ENABLED" ]; then - echo "false" - else echo "true" - fi } add_os_flags() { CMAKE_BUILD_COMMAND="${CMAKE_BUILD_COMMAND} -DFAIL_ON_WARNINGS= " @@ -31,11 +27,12 @@ bootstrap_cmake(){ sudo apt-get -y install cmake } build_deps(){ + sudo apt-get -y update ## need to account for debian - sudo apt-get install libssl1.0-dev > /dev/null + sudo apt-get install -y libssl1.0-dev > /dev/null RETVAL=$? - if ["$RETVAL" -ne "0"]; then - sudo apt-get install libssl-dev > /dev/null + if [ "$RETVAL" -ne "0" ]; then + sudo apt-get install -y libssl-dev > /dev/null fi COMMAND="sudo apt-get -y install cmake gcc g++ zlib1g-dev uuid uuid-dev" export DEBIAN_FRONTEND=noninteractive @@ -58,6 +55,7 @@ build_deps(){ elif [ "$FOUND_VALUE" = "openssl" ]; then INSTALLED+=("openssl") elif [ "$FOUND_VALUE" = "libusb" ]; then + INSTALLED+=("libusb-1.0-0-dev") INSTALLED+=("libusb-dev") elif [ "$FOUND_VALUE" = "libpng" ]; then INSTALLED+=("libpng-dev")
