From 20b6273a65ab4d99ad760fd715ca935494d4fc2e Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Sun, 28 Mar 2021 12:55:03 +0100
Subject: Configuration: corrected check of group name

When built in 'group' mode, the write permissions of all created files will
be activated for a certain group of users in the host operating system. The
user specifies the name of the group with the '--group' option at configure
time. At the very start, the './project' script checks to see if the given
group name actually exists or not (to avoid hard-to-debug errors popping up
later).

Until now, the checking 'sg' command (that was used to build the project
with group-writable permissions) would always fail due to the excessive
number of redirections. Therefore, it would always print the error message
and abort.

With this commit, the output of 'sg' is no longer re-directed (which also
helps users in debuggin). If the group does actually exist, it will just
print a small statement saying so, and if it fails, the error message is
printed. This fixed the problem, allowing maneage to be built in
group-mode.

I also noticed that the variable name keeping the group name
('reproducible_paper_group_name') used the old name for the project (which
was "Reproducible paper template"! So it has been changed/corrected to
'maneage_group_name'.
---
 reproduce/software/shell/configure.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'reproduce/software/shell')

diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh
index fe46cef..e15a8e9 100755
--- a/reproduce/software/shell/configure.sh
+++ b/reproduce/software/shell/configure.sh
@@ -771,7 +771,7 @@ fi
 # exists and we don't want to re-write it).
 if [ $rewritepconfig = no ]; then
     oldgroupname=$(awk '/GROUP-NAME/ {print $3; exit 0}' $pconf)
-    if [ "x$oldgroupname" = "x$reproducible_paper_group_name" ]; then
+    if [ "x$oldgroupname" = "x$maneage_group_name" ]; then
         just_a_place_holder_to_avoid_not_equal_test=1;
     else
         echo "-----------------------------"
@@ -1089,7 +1089,7 @@ if [ $rewritepconfig = yes ]; then
         -e's|@ddir[@]|'"$ddir"'|' \
         -e's|@sys_cpath[@]|'"$sys_cpath"'|' \
         -e's|@downloader[@]|'"$downloader"'|' \
-        -e's|@groupname[@]|'"$reproducible_paper_group_name"'|' \
+        -e's|@groupname[@]|'"$maneage_group_name"'|' \
         $pconf.in >> $pconf
 else
     # Read the values from existing configuration file. Note that the build
@@ -1248,7 +1248,7 @@ if ! [ -d "$mtexdir" ]; then mkdir "$mtexdir"; fi
 # TeX build directory. If built in a group scenario, the TeX build
 # directory must be separate for each member (so they can work on their
 # relevant parts of the paper without conflicting with each other).
-if [ "x$reproducible_paper_group_name" = x ]; then
+if [ "x$maneage_group_name" = x ]; then
     texbdir="$texdir"/build
 else
     user=$(whoami)
@@ -1758,10 +1758,10 @@ echo `.local/bin/date` > $finaltarget
 #
 # The configuration is now complete, we can inform the user on the next
 # step(s) to take.
-if [ x$reproducible_paper_group_name = x ]; then
+if [ x$maneage_group_name = x ]; then
     buildcommand="./project make -j8"
 else
-    buildcommand="./project make --group=$reproducible_paper_group_name -j8"
+    buildcommand="./project make --group=$maneage_group_name -j8"
 fi
 cat <<EOF
 
-- 
cgit v1.2.1