Fixing install script

build_pdata.sh

@@ -58,7 +58,7 @@ then
  module load boost/1.54.0
 
  sh ./autogen.sh
- ./install --with-boost=/sw/apps/boost/1.54.0/  CXX=mpic++
+ ./install -s -c "--with-boost=/sw/apps/boost/1.54.0/"  CXX=mpic++
  make
  if [ $? -ne 0 ]; then exit 1 ; fi
 

install

 #! /bin/bash
 
-##
-
+source script/help
 source script/discover_os
 source script/show_solutions
+
+##
+
+install_req=1
+i_dir=" "
+sq=0
+
+while getopts :di:shc: FLAG; do
+  case $FLAG in
+    d)
+      echo "Disable depencencies installation"
+      install_req=0
+      ;;
+    i)
+      echo "Setting dependencies installation dir: $OPTARG"
+      i_dir=$OPTARG
+      ;;
+    s)
+      echo "Skipping user cin"
+      sq=1
+      ;;
+    c)
+      echo "Fowarding options $OPTARG to configure script"
+      configure_options=$OPTARG
+      ;;
+    h)  #show help
+      HELP
+      ;;
+    \?) #unrecognized option - are fowarded to configure
+      ;;
+  esac
+done
+
 discover_os
 
 ## Check and try to install the prerequisites
@@ -17,7 +49,9 @@ git submodule update
 
 # Create config directory
 
-mkdir src/config
+if [ ! -d src/config ]; then
+  mkdir src/config
+fi
 
 ## generate configure script
 
@@ -27,22 +61,7 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
-## check for an install dir file or option
-
-i_dir=" "
-if [ -f install_deps_dir ]; then
- i_dir=$(install_deps_dir)
-fi
-
-getopts i: i_dir_opt
-
-case $i_dir_opt in
-  i)
-    i_dir="$OPTARG"
-    ;;
-  \?)
-    ;;
-esac
+## check for options
 
 if [ x"$i_dir" == x" " ]; then
  i_dir="$HOME"
@@ -51,28 +70,16 @@ fi
 echo -e "\033[1;34;5mDEPENCENCIES INSTALLATION DIR      \033[0m"
 echo -e "Every required dependencies if needed will be installed into: \033[1;34;5m$i_dir\033[0m"
 echo -e "if you want to install somewhere else do ./install -i /somewhere/else"
-commands[0]="Continue"
-possible_solutions "${commands[@]}"
-
+if [ $sq -eq 0 ]; then
+  commands[0]="Continue"
+  possible_solutions "${commands[@]}"
+fi
 
 echo -e "Installing requirements into: $i_dir "
 
 ##
 
-## Take all the options with the exception of -d or -i
-
-install_req=1
-configure_options=""
-
-for var in $@
-do
-    echo $var
-    if [ x"$var" != x"-d" ] ; then
-       configure_options="$configure_options $var"
-    else
-       install_req=0
-    fi
-done
+## Take all the options with the exception of -d -i -s
 
 ## call the configure script
 
@@ -90,6 +97,8 @@ fi
 
 ##
 
+echo "./configure $options $configure_options" 
+
 if [ $install_req -eq 0 ]; then
     ./configure $options $configure_options
 else

m4/ax_cuda.m4

@@ -57,8 +57,13 @@ AS_IF([test "x$NVCC_EXIST" = "xno"],[],[
           # If $build_cpu contains "_64", append "64" to CUDA_LIBS
           AS_IF([echo $build_cpu | grep -q "_64"],
                 [
-                 AS_IF([ test -d {CUDA_LIBS}lib64 ], [ CUDA_LIBS+="64"  ])
-                 AS_IF([ command -v bumblebee >/dev/null  ], [ CUDA_LIBS+=" -L/usr/lib64/nvidia-bumblebee/ "  ])
+                 AS_IF([ test -d {CUDA_LIBS}lib64 ], [ CUDA_LIBS+="64" ])
+                 command -v bumblebee >/dev/null
+                 echo " DIOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO CANE: $? "
+                 AS_IF([ ! command -v bumblebee >/dev/null  ], [ 
+                                                               CUDA_LIBS+=" -L/usr/lib64/nvidia-bumblebee/ "  
+                                                               echo "PORCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA MADONNA"
+                                                             ])
                  AS_IF([ test -d /usr/local/cuda/lib64  ], [ CUDA_LIBS+=" -L/usr/local/cuda/lib64 "  ],
                        [
                         AS_IF([ test -d /usr/local/cuda/lib ],[ CUDA_LIBS+=" -L/usr/local/cuda/lib  "  ])

script/show_solutions

@@ -9,7 +9,7 @@ function possible_solutions {
    sol=`expr $sol + 1`
  done
  echo "$sol exit the script"
- echo "Choose the solution:"
+ echo -e "\033[1;34;5mChoose the solution:\033[0m"
  read choose
  if [ x"$choose" = x"$sol" ]; then
   exit 1