Repository: nifi-minifi-cpp Updated Branches: refs/heads/master 0b85b6983 -> 1f37299c4
MINIFICPP-461 Referencing sourced scripts by their absolute paths to resolve issues in bootstrapping on RHEL derived distributions. This closes #304. Signed-off-by: Marc Parisi <[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/1f37299c Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/1f37299c Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/1f37299c Branch: refs/heads/master Commit: 1f37299c4ea6512933eff8ef0f5d2f0656a9579c Parents: 0b85b69 Author: Aldrin Piri <[email protected]> Authored: Fri Apr 20 09:34:12 2018 -0400 Committer: Marc Parisi <[email protected]> Committed: Fri Apr 20 10:35:13 2018 -0400 ---------------------------------------------------------------------- bootstrap.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/1f37299c/bootstrap.sh ---------------------------------------------------------------------- diff --git a/bootstrap.sh b/bootstrap.sh index 69c776a..a23b0d5 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -16,6 +16,7 @@ # under the License. #!/bin/bash +script_directory="$(cd "$(dirname "$0")" && pwd)" #RED='\033[0;41;30m' RED='\033[0;101m' @@ -149,28 +150,28 @@ 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 + . "${script_directory}/darwin.sh" elif [[ "$OS" = Deb* ]]; then - source debian.sh + . "${script_directory}/debian.sh" elif [[ "$OS" = Rasp* ]]; then - source aptitude.sh + . "${script_directory}/aptitude.sh" elif [[ "$OS" = Ubuntu* ]]; then - source aptitude.sh + . "${script_directory}/aptitude.sh" elif [[ "$OS" = *SUSE* ]]; then - source suse.sh + . "${script_directory}/suse.sh" elif [[ "$OS" = *SLE* ]]; then if [[ "$VER" = 11* ]]; then echo "Please install SLES11 manually...exiting" exit else - source ./suse.sh + . "${script_directory}/suse.sh" fi elif [[ "$OS" = Red* ]]; then - source rheldistro.sh + . "${script_directory}/rheldistro.sh" elif [[ "$OS" = CentOS* ]]; then - source centos.sh + . "${script_directory}/centos.sh" elif [[ "$OS" = Fedora* ]]; then - source fedora.sh + . "${script_directory}/fedora.sh" fi
