Imported recent work in Maneage, minor conflicts fixed

Some minor conflicts (all expected from the commit messages in the Maneage
branch) occurred but were easily fixed.

1 files changed, 7 insertions, 10 deletions

diff --git a/project b/project
index a6bbf93..a99e0a6 100755
--- a/project
+++ b/project
@@ -4,6 +4,7 @@
 # Run `./project --help' for a description of how to use it.
 #
 # Copyright (C) 2019-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+# Copyright (C) 2021      Raul Infante-Sainz <infantesainz@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -47,7 +48,6 @@ existing_conf=0
 highlightnotes=0
 separatesupplement=0
 scriptname="./project"
-minmapsize=10000000000
 
 
 
@@ -109,7 +109,6 @@ Configure options:
   -e, --existing-conf      Use (possibly existing) local configuration.
       --host-cc            Use host system's C compiler, don't build GCC.
   -i, --input-dir=STR      Directory containing input datasets (optional).
-  -m, --minmapsize=INT     [Gnuastro] Minimum number of bytes to use RAM.
   -s, --software-dir=STR   Directory containing necessary software tarballs.
       --check-config       During configuration, show what is being built.
       --clean-texdir       Remove possibly existing build-time subdirectories
@@ -118,12 +117,13 @@ Configure options:
       --all-highlevel      Build all high-level software (for development).
 
 Configure and Make options:
+  -d, --debug[=FLAGS]      In configure: use -j1, no -k, and no Zenodo check.
+                           In make: 'FLAGS' will be directly passed to 'make'.
   -g, --group=STR          Build and run with write permissions for a group.
   -j, --jobs=INT           Number of threads to build/run the software.
   -?, --help               Print this help list.
 
 Make (analysis) options:
-  -d, --debug=FLAGS        Print various types of debugging information.
   -p, --prepare-redo       Re-do preparation (only done automatically once).
 
 Make (final PDF) options:
@@ -186,9 +186,6 @@ do
   -i|--input-dir)        input_dir="$2";                                     check_v "$1" "$input_dir";    shift;shift;;
   -i=*|--input-dir=*)    input_dir="${1#*=}";                                check_v "$1" "$input_dir";    shift;;
   -i*)                   input_dir=$(echo    "$1" | sed -e's/-i//');         check_v "$1" "$input_dir";    shift;;
-  -m|--minmapsize)       minmapsize="$2";                                    check_v "$1" "$minmapsize";   shift;shift;;
-  -m=*|--minmapsize=*)   minmapsize="${1#*=}";                               check_v "$1" "$minmapsize";   shift;;
-  -m*)                   minmapsize=$(echo   "$1" | sed -e's/-m//');         check_v "$1" "$minmapsize";   shift;;
   -s|--software-dir)     software_dir="$2";                                  check_v "$1" "$software_dir"; shift;shift;;
   -s=*|--software-dir=*) software_dir="${1#*=}";                             check_v "$1" "$software_dir"; shift;;
   -s*)                   software_dir=$(echo "$1" | sed -e's/-s//');         check_v "$1" "$software_dir"; shift;;
@@ -333,14 +330,14 @@ fi
 if ! [ x$group = x ]; then
 
     # Check if group is usable.
-    if ! sg "$group" "echo test &> /dev/null" &> /dev/null; then
+    if ! sg "$group" "echo Group \'$group\' exists"; then
         echo "$scriptname: '$group' is not a usable group name on this system.";
         echo "(TIP: you can use the 'groups' command to see your groups)"
         exit 1
     fi
 
     # Set the group option for running Make.
-    gopt="reproducible_paper_group_name=$group"
+    gopt="maneage_group_name=$group"
 fi
 
 
@@ -444,15 +441,15 @@ case $operation in
 
         # Variables to pass to the configuration script.
         export jobs=$jobs
+        export debug=$debug
         export host_cc=$host_cc
         export build_dir=$build_dir
         export input_dir=$input_dir
         export scriptname=$scriptname
-        export minmapsize=$minmapsize
+        export maneage_group_name=$group
         export software_dir=$software_dir
         export existing_conf=$existing_conf
         export all_highlevel=$all_highlevel
-        export reproducible_paper_group_name=$group
 
         # Run the configuration script
         if [ x"$group" = x ]; then