From b0993336112b244ea7e919d96ffdbaf167831b9d Mon Sep 17 00:00:00 2001
From: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Date: Tue, 30 Apr 2019 18:51:47 +0100
Subject: End-of-line Backslashs no longer right under each other

When we need to quote the new-line character we end the line with a
backslash (`\'). Until now, our convention has been to put all such
backslashes under each other to help in visual inspection.

But this causes a lot of confusion in version control: if only one line's
length is larger, the whole block will be marked as changed and thus makes
it hard to visually see the actual change. It also makes debuging the code
(adding some temporary lines) hard.

With this commit, I went through all the files and tried to fix all such
cases so only a single white space character is between the last command
character and the backslash. Where there was an empty line (ending with a
backslash, to help in visually separating the code into blocks), I put the
backslash right under the previous line's.

This completes task #15259.
---
 configure | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a71c815..e99776b 100755
--- a/configure
+++ b/configure
@@ -519,10 +519,10 @@ if [ $rewritepconfig = yes ]; then
     create_file_with_notice $pconf
 
     # Write the values.
-    sed -e's|@bdir[@]|'"$bdir"'|'              \
-        -e's|@indir[@]|'"$indir"'|'            \
-        -e's|@ddir[@]|'"$ddir"'|'              \
-        -e's|@downloader[@]|'"$downloader"'|'  \
+    sed -e's|@bdir[@]|'"$bdir"'|' \
+        -e's|@indir[@]|'"$indir"'|' \
+        -e's|@ddir[@]|'"$ddir"'|' \
+        -e's|@downloader[@]|'"$downloader"'|' \
         -e's|@groupname[@]|'"$reproducible_paper_group_name"'|' \
         $pconf.in >> $pconf
 else
@@ -959,12 +959,12 @@ fi
 # Bash, Make, or AWK. In this step, we'll install such low-level basic
 # tools, but we have to be very portable (and use minimal features in all).
 make -f reproduce/software/make/basic.mk \
-     rpath_command=$rpath_command        \
-     static_build=$static_build          \
-     needs_ldl=$needs_ldl                \
-     on_mac_os=$on_mac_os                \
-     numthreads=$numthreads              \
-     host_cc=$host_cc                    \
+     rpath_command=$rpath_command \
+     static_build=$static_build \
+     needs_ldl=$needs_ldl \
+     on_mac_os=$on_mac_os \
+     numthreads=$numthreads \
+     host_cc=$host_cc \
      -j$numthreads
 
 
@@ -984,10 +984,10 @@ else
     numthreads=$jobs
 fi
 ./.local/bin/make -f reproduce/software/make/high-level.mk \
-                  rpath_command=$rpath_command             \
-                  static_build=$static_build               \
-                  on_mac_os=$on_mac_os                     \
-                  numthreads=$numthreads                   \
+                  rpath_command=$rpath_command \
+                  static_build=$static_build \
+                  on_mac_os=$on_mac_os \
+                  numthreads=$numthreads \
                   -j$numthreads
 
 
@@ -1057,22 +1057,22 @@ function prepare_name_version() {
 
         # Count how many names there are. This is necessary to identify the
         # last element.
-        num=$(.local/bin/cat $@               \
+        num=$(.local/bin/cat $@ \
                   | .local/bin/sed '/^\s*$/d' \
                   | .local/bin/wc -l)
 
         # Put them all in one paragraph.
-        .local/bin/cat $@                                     \
-            | .local/bin/sort                                 \
-            | .local/bin/awk 'NF>0 {                          \
-                  c++;                                        \
-                  if(c==1)                                    \
-                    {                                         \
-                      if('$num'==1) printf("%s", $0);         \
-                      else          printf("%s", $0);         \
-                    }                                         \
+        .local/bin/cat $@ \
+            | .local/bin/sort \
+            | .local/bin/awk 'NF>0 { \
+                  c++; \
+                  if(c==1) \
+                    { \
+                      if('$num'==1) printf("%s", $0); \
+                      else          printf("%s", $0); \
+                    } \
                   else if(c=='$num') printf(" and %s\n", $0); \
-                  else printf(", %s", $0)                     \
+                  else printf(", %s", $0) \
                 }'
     fi
 }
-- 
cgit v1.2.1