Merge pull request #240 from Jiri-Kremser/fedora-26-support

install-deps script now works also with Fedora 26
torch · Oct 18, 2017 · 20e5237 · 20e5237
2 parents 481c506 + f54c822
commit 20e5237
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/install-deps b/install-deps
@@ -312,7 +312,7 @@ elif [[ "$(uname)" == 'Linux' ]]; then
                                 qt-devel qtwebkit-devel sox-plugins-freeworld \
                                 ipython
             install_openblas || true
-        elif [[ $fedora_major_version == '22' ||  $fedora_major_version == '23' ]]; then
+        elif [[ $fedora_major_version -ge '22' ||  $fedora_major_version -le '26' ]]; then
             #using dnf - since yum has been deprecated
             #sox-plugins-freeworld is not yet available in repos for F22
             sudo dnf install -y make cmake curl readline-devel ncurses-devel \
@@ -322,14 +322,6 @@ elif [[ "$(uname)" == 'Linux' ]]; then
                                 sox-devel sox qt-devel qtwebkit-devel \
                                 python-ipython czmq czmq-devel
             install_openblas || true
-        elif [[ $fedora_major_version == '24' ||  $fedora_major_version == '25' ]]; then
-            sudo dnf install -y make cmake curl readline-devel ncurses-devel \
-                                gcc-c++ gcc-gfortran git gnuplot unzip \
-                                libjpeg-turbo-devel libpng-devel \
-                                ImageMagick GraphicsMagick-devel fftw-devel \
-                                sox-devel sox qt-devel qtwebkit-devel \
-                                python-ipython czmq czmq-devel
-            install_openblas || true
         else
             echo "Only Fedora 20-25 are supported for now, aborting."
             exit 1