Accept space in mod path (#803)

Author: Nicolas Cornu

coreneuron/CMakeLists.txt

@@ -307,7 +307,7 @@ set_target_properties(
 # =============================================================================
 # create special-core with halfgap.mod for tests
 # =============================================================================
-set(modfile_directory "${CORENEURON_PROJECT_SOURCE_DIR}/tests/integration/ring_gap/mod")
+set(modfile_directory "${CORENEURON_PROJECT_SOURCE_DIR}/tests/integration/ring_gap/mod files")
 file(GLOB modfiles "${modfile_directory}/*.mod")
 
 if(CORENRN_ENABLE_SHARED)

extra/nrnivmodl-core.in

@@ -15,19 +15,19 @@ set -e
 unset PMI_RANK
 
 # name of the script
-APP_NAME=$(basename $0)
+APP_NAME="$(basename "$0")"
 
 # directory and parent directory of this script
-PARENT_DIR="$(dirname $BASH_SOURCE)/.."
+PARENT_DIR="$(dirname "$BASH_SOURCE")/.."
 
 # prefer perl exe set by neuron wrappers in case of wheel
-PERL_EXE=${CORENRN_PERLEXE:-@PERL_EXECUTABLE@}
+PERL_EXE="${CORENRN_PERLEXE:-@PERL_EXECUTABLE@}"
 # in case of mac installer, wrapper is not used and hence
 # check if binary exist. otherwise, just rely on perl being
 # in default $PATH
-if [ ! -f "${PERL_EXE}" ]; then PERL_EXE=$(which perl); fi
+if [ ! -f "${PERL_EXE}" ]; then PERL_EXE="$(which perl)"; fi
 
-ROOT_DIR=$(${PERL_EXE} -e "use Cwd 'abs_path'; print abs_path('$PARENT_DIR')")
+ROOT_DIR="$("${PERL_EXE}" -e "use Cwd 'abs_path'; print abs_path('$PARENT_DIR')")"
 
 # default arguments : number of parallel builds and default mod file path
 PARALLEL_BUILDS=4
@@ -101,42 +101,45 @@ fi
 
 # if defined mods dir be in $1
 if [ $# -eq 1 ]; then
-    # Note: due to bug #712 makefile wont handle mod dir with spaces, so we let it fail here
-    params_MODS_PATH=$1
+    params_MODS_PATH="$1"
 fi
 
+shopt -s nullglob
 # warn if no mod files provided
-if [ -d $params_MODS_PATH ]; then
-    ls $params_MODS_PATH/*.mod &>/dev/null || echo "WARNING: No mod files found, compiling default ones only!"
+if [ -d "$params_MODS_PATH" ]; then
+    files=( "$params_MODS_PATH"/*.mod )
+    if [ ${#files} -eq 0 ]; then
+        echo "WARNING: No mod files found in '$(realpath ${params_MODS_PATH})', compiling default ones only!"
+    fi
 else
     echo "FATAL: Invalid mods directory: '$params_MODS_PATH'"
     exit 1
 fi
 
 # temporary directory where mod files will be copied
-temp_mod_dir=@CMAKE_HOST_SYSTEM_PROCESSOR@/corenrn/mod2c
-mkdir -p $temp_mod_dir
+temp_mod_dir="@CMAKE_HOST_SYSTEM_PROCESSOR@/corenrn/mod2c"
+mkdir -p "$temp_mod_dir"
 
 # copy mod files with include files. note that ${ROOT_DIR}/share
 # has inbuilt mod files and user provided mod files are in $params_MODS_PATH.
 set +e
-for mod_dir in ${ROOT_DIR}/share/modfile $params_MODS_PATH;
+for mod_dir in "${ROOT_DIR}/share/modfile" "$params_MODS_PATH" ;
 do
     # copy mod files and include files
-    files=`ls $mod_dir/*.mod $mod_dir/*.inc $mod_dir/*.h* 2>/dev/null`
-    for f in $files;
+    files=( "$mod_dir/"*.mod "$mod_dir/"*.inc "$mod_dir/"*.h* )
+    for f in "${files[@]}";
     do
         # copy mod files only if it's changed (to avoid rebuild)
-        target_file_path=$temp_mod_dir/`basename $f`
-        if ! diff -q $f $target_file_path &>/dev/null;  then
-            cp $f $target_file_path
+        target_file_path="$temp_mod_dir/$(basename "$f")"
+        if ! diff -q "$f" "$target_file_path" &>/dev/null;  then
+            cp "$f" "$target_file_path"
         fi
     done
 done
 set -e
 
 # use new mod files directory for compilation
-params_MODS_PATH=$temp_mod_dir
+params_MODS_PATH="$temp_mod_dir"
 
 # build params to make command
 make_params=("ROOT=${ROOT_DIR}")