fixes for Alt Linux

2 files changed, 30 insertions, 27 deletions

diff --git a/scripts/check-dependencies.sh b/scripts/check-dependencies.sh
index 8b2f550..dea2e27 100755
--- a/scripts/check-dependencies.sh
+++ b/scripts/check-dependencies.sh
@@ -158,20 +158,17 @@ bison_sysver()
 
 gcc_sysver()
 {
-  bingcc=$1/bin/gcc
-  if [ ! -x $1/bin/gcc ]; then
-    if [ "`command -v gcc`" ]; then # fallback to $PATH
-      bingcc=gcc;
+  bingcc=$1/bin/g++
+  if [ ! -x $1/bin/g++ ]; then
+    if [ "`command -v g++`" ]; then # fallback to $PATH
+      bingcc=g++;
     fi
   fi
   debug using bingcc: $bingcc
   if [ ! -x $bingcc ]; then return; fi
   if [ ! "`$bingcc --version`" ]; then return; fi
-  gccver=`$bingcc --version| grep -i gcc`
-  debug gcc output1: $gccver
-  gccver=`echo $gccver | sed s/"(.*)"//g `
-  debug gcc output2: $gccver
-  gccver=`echo $gccver | sed s/"[^0-9. ]"/" "/g | awk '{print $1}'`
+  gccver=`$bingcc --version| grep -i g++ | awk ' { print $3 } '`
+  debug g++ output1: $gccver
   gcc_sysver_result=$gccver
 }
 
@@ -252,6 +249,13 @@ set_default_package_map()
 
 apt_pkg_search()
 {
+
+  if [ ! "`command -v dpkg`" ]; then
+    # can't handle systems that use apt-get for RPMs (alt linux)
+    debug command dpkg not found. cannot search packages.
+    return
+  fi
+
   debug apt_pkg_search $*
   apt_pkg_search_result=
   pkgname=$1
@@ -279,10 +283,6 @@ apt_pkg_search()
   fi
 
   debug $pkgname ".deb name:" $debpkgname
-  if [ ! "`command -v dpkg`" ]; then
-    debug command dpkg not found. cannot search packages.
-    return
-  fi
 
   # examples of apt version strings
   # cgal 4.0-4   gmp 2:5.0.5+dfsg  bison 1:2.5.dfsg-2.1 cmake 2.8.9~rc1
@@ -636,10 +636,10 @@ checkargs()
 
 main()
 {
-  deps="qt4 cgal gmp cmake mpfr boost opencsg glew eigen gcc"
+  deps="qt4 cgal gmp mpfr boost opencsg glew eigen gcc"
   deps="$deps bison flex make"
-  #deps=$deps curl git # not technically necessary for build
-  #deps="$deps python" # only needed for tests
+  #deps="$deps curl git" # not technically necessary for build
+  #deps="$deps python cmake" # only needed for tests
   #deps="$deps imagemagick" # needs work, only needed for tests
   #deps="eigen glew opencsg" # debugging
   pretty_print title
diff --git a/scripts/uni-get-dependencies.sh b/scripts/uni-get-dependencies.sh
index c530be9..58bebe6 100755
--- a/scripts/uni-get-dependencies.sh
+++ b/scripts/uni-get-dependencies.sh
@@ -10,6 +10,13 @@ get_fedora_deps()
   boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc pkgconfig git
 }
 
+get_altlinux_deps()
+{
+ for i in boost-devel boost-filesystem-devel gcc4.5 gcc4.5-c++ \
+  eigen2 libmpfr libgmp libgmp_cxx qt4-devel libcgal-devel git-core \
+  libglew-devel flex bison; do sudo apt-get install $i; done
+}
+
 get_freebsd_deps()
 {
  pkg_add -r bison boost-libs cmake git bash eigen2 flex gmake gmp mpfr \
@@ -20,8 +27,6 @@ get_freebsd_deps()
 
 get_netbsd_deps()
 {
- echo Netbsd: You must install the X sets before running..
- sleep 2
  sudo pkgin install bison boost cmake git bash eigen flex gmake gmp mpfr \
   qt4 glew cgal opencsg modular-xorg
 }
@@ -34,14 +39,10 @@ get_opensuse_deps()
 
 get_mageia_deps()
 {
- pklist="task-c-devel task-c++-devel"
- pklist="$pklist libqt4-devel libgmp-devel libmpfr-devel"
- pklist="$pklist libboost-devel eigen3-devel libglew-devel"
- pklist="$pklist bison flex"
- pklist="$pklist cmake imagemagick python curl git"
- # cgal + opencsg don't exist
  sudo urpmi ctags
- sudo urpmi $pklist
+ sudo urpmi task-c-devel task-c++-devel libqt4-devel libgmp-devel \
+  libmpfr-devel libboost-devel eigen3-devel libglew-devel bison flex \
+  cmake imagemagick python curl git
 }
 
 get_debian_deps()
@@ -74,8 +75,10 @@ if [ -e /etc/issue ]; then
   get_fedora_deps
  elif [ "`grep -i mageia /etc/issue`" ]; then
   get_mageia_deps
- else
-  unknown
+ elif [ "`command -v rpm`" ]; then
+  if [ "`rpm -qa | grep altlinux`" ]; then
+   get_altlinux_deps
+  fi
  fi
 elif [ "`uname | grep -i freebsd `" ]; then
  get_freebsd_deps