5 files changed, 31 insertions, 10 deletions
diff --git a/reproduce/software/shell/apptainer-README.md b/reproduce/software/shell/apptainer-README.md
index a7826ec..49ce82f 100644
--- a/reproduce/software/shell/apptainer-README.md
+++ b/reproduce/software/shell/apptainer-README.md
@@ -47,7 +47,7 @@ software environment) to easily move it from one computer to another.
       project. This file is necessary for future runs of your project
       within the container.
 
- 3. To execute your project remote the `--build-only` and use `./run.sh` to
+ 3. To execute your project remove the `--build-only` and use `./run.sh` to
     execute it. If you want to enter your Maneage'd project shell, add the
     `--project-shell` option to the call inside `./run.sh`.
 
diff --git a/reproduce/software/shell/apptainer.sh b/reproduce/software/shell/apptainer.sh
index c581ade..51b36db 100755
--- a/reproduce/software/shell/apptainer.sh
+++ b/reproduce/software/shell/apptainer.sh
@@ -291,10 +291,11 @@ else
     # necessary tools.
     if [ -f $base_name ]; then
         if [ $quiet = 0 ]; then
-            printf "$scriptname: info: base OS docker image ('$base_name') "
-            printf "already exists and will be used. If you want to build a "
-            printf "new base OS image, give a new name to '--base-name'. "
-            printf "To remove this message run with '--quiet'\n"
+            printf "$scriptname: info: base OS apptainer image "
+            printf "('$base_name') already exists and will be used. "
+            printf "If you want to build a new base OS image, give "
+            printf "a new name to '--base-name'. To remove this "
+            printf "message run with '--quiet'\n"
         fi
     else
 
diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index a409920..29b0ea6 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -1891,9 +1891,10 @@ ______________________________________________________
 !!!!!!!!!!!!!!!        Warning        !!!!!!!!!!!!!!!!
 
 TeX Live couldn't be installed during the configuration (probably because
-there were downloading problems). TeX Live is only necessary in making the
-final PDF (which is only done after all the analysis has been complete). It
-is not used at all during the analysis.
+there were downloading problems, or you used the '--offline' option). TeX
+Live is only necessary in making the final PDF (which is only done after
+all the analysis has been complete). It is not used at all during the
+analysis.
 
 Therefore, if you don't need the final PDF, and just want to do the
 analysis, you can safely ignore this warning and continue.
diff --git a/reproduce/software/shell/prep-source.sh b/reproduce/software/shell/prep-source.sh
index dcdc472..2545460 100755
--- a/reproduce/software/shell/prep-source.sh
+++ b/reproduce/software/shell/prep-source.sh
@@ -77,6 +77,20 @@ fi
 if [ -f "$bindir/bash" ]; then shpath="$bindir"/bash
 else                           shpath="$bindir"/dash
 fi
+
+# On MacOS the syntax for 'stat' is a bit different, so if we are using the
+# system one on mac we need a specific syntax. The one installed by maneage
+# instead uses the ordinary Linux syntax.
+if [ -f "$bindir/stat" ] || [ x"$on_mac_os" = xno ]; then
+  format="--format %a"
+else
+  format="-f %OLp"
+fi
+
+# On MacOS 'touch' wants the time expressed according to ISO8601 with a
+# precision up to the seconds. We then use 'sed' to remove the information
+# regarding the timezone, as the format is not accepted by 'touch'.
+# LCTYPE and LANG are also required on macos systems by sed.
 grep -I -r -e'/bin/sh' $(pwd)/* \
     | sed -e's|:|\t|' \
     | awk 'BEGIN{FS="\t"}{print $1}' \
@@ -84,8 +98,10 @@ grep -I -r -e'/bin/sh' $(pwd)/* \
     | uniq \
     | while read filename; do \
          tmp="$filename".tmp; \
-         origtime="$(date -R -r "$filename")"; \
-         origperm=$(stat -c '%a' "$filename"); \
+         origtimex="$(date -Iseconds -r "$filename")"; \
+         origtime=$(echo $origtimex | sed 's/.\{6\}$//'); \
+         origperm=$(stat $format "$filename"); \
+         LC_CTYPE=C; LANG=C; \
          sed -e's|/bin/sh|'"$shpath"'|g' "$filename" > "$tmp"; \
          mv "$tmp" "$filename"; \
          chmod $origperm "$filename"; \
diff --git a/reproduce/software/shell/tarball-prepare.sh b/reproduce/software/shell/tarball-prepare.sh
index 8e30931..4d6d1e2 100755
--- a/reproduce/software/shell/tarball-prepare.sh
+++ b/reproduce/software/shell/tarball-prepare.sh
@@ -51,6 +51,9 @@ basedir=$PWD
 scriptname=$0
 
 
+
+
+
 # The --help output
 print_help() {
     cat <<EOF