Skip to content

Commit 2eb20f1

Browse files
David Wilcockuglide
David Wilcock
authored andcommitted
Add CentOS (7) checks and feedback in configure script (RedisInsight#3637)
Add CentOS (7) vendor check in with Fedora build commands, including some feedback if yum fails on any of the dependencies
1 parent 465fd4c commit 2eb20f1

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/configure

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [ "$1" == "breakpad" ]; then
2121
fi
2222

2323
if [ "$os_VENDOR" == "Ubuntu" ]; then
24-
ubuntu_ver=${os_RELEASE:0:2}
24+
ubuntu_ver=${os_RELEASE:0:2}
2525
print_title "Build RDM on Ubuntu: $ubuntu_ver"
2626

2727
if [ "$ubuntu_ver" == "12" ]; then
@@ -62,23 +62,29 @@ if [ "$os_VENDOR" == "Ubuntu" ]; then
6262
dh-make diffutils patch gnupg fakeroot lintian pbuilder git python perl -y
6363
sudo apt-get build-dep qt5-default -y
6464
fi
65-
65+
6666
print_title "Check deps"
6767
sudo apt-get install automake libtool libssl-dev \
6868
libssh2-1-dev g++ libgl1-mesa-dev -y
6969

7070
build_breakpad
7171

7272
print_title "Run: source /opt/qt${RDM_QT_VERSION:0:2}/bin/qt${RDM_QT_VERSION:0:2}-env.sh && qmake && make "
73-
elif [ "$os_VENDOR" == "Fedora" ]; then
74-
print_title "Build RDM on Fedora: $os_RELEASE"
73+
elif [ "$os_VENDOR" == "Fedora" ] || [[ "$os_VENDOR" == "CentOS" && "$os_RELEASE" -ge "7" ]]; then
74+
print_title "Build RDM on $os_VENDOR: $os_RELEASE"
7575

7676
print_title "Check deps"
7777
sudo yum install libssh2 libssh2-devel qt5-qtbase qt5-qtsvg-devel \
7878
qt5-qtdeclarative-devel qt5-qtgraphicaleffects qt5-qtquickcontrols \
7979
qt5-qttools gcc gcc-c++ libstdc++-static git rsync \
8080
redhat-rpm-config -y
8181

82+
if [[ $? == 1 && "$os_VENDOR" == "CentOS" ]]; then
83+
# Some of the deps might need to come from Epel, so output a nice message
84+
print_title "Not all dependencies were found. Ensure you have the epel repo installed and enabled."
85+
exit
86+
fi
87+
8288
build_breakpad
8389

8490
print_title "Run: qmake-qt5 && make "

0 commit comments

Comments
 (0)