10 files changed, 12 insertions, 12 deletions
diff --git a/README-hacking.md b/README-hacking.md
index 324ada4..244cb23 100644
--- a/README-hacking.md
+++ b/README-hacking.md
@@ -959,8 +959,8 @@ for the benefit of others.
 
    - *Environment of each recipe*: If you need to define a special
       environment (or alises, or scripts to run) for all the recipes in
-      your Makefiles, you can use the Bash startup file
-      `reproduce/software/bash/bashrc.sh`. This file is loaded before every
+      your Makefiles, you can use a Bash startup file
+      `reproduce/software/shell/bashrc.sh`. This file is loaded before every
       Make recipe is run, just like the `.bashrc` in your home directory is
       loaded everytime you start a new interactive, non-login terminal. See
       the comments in that file for more.
diff --git a/project b/project
index 89361ae..f9a7537 100755
--- a/project
+++ b/project
@@ -294,7 +294,7 @@ controlled_env() {
 # Do requested operation
 # ----------------------
 perms="u+r,u+w,g+r,g+w,o-r,o-w,o-x"
-configscript=./reproduce/software/bash/configure.sh
+configscript=./reproduce/software/shell/configure.sh
 case $operation in
 
     # Build the project's software.
@@ -314,7 +314,7 @@ case $operation in
         # `reproduce/*/bash' should need executable flags, so we are giving
         # them executable flags by default. If any other file in your project
         # needs such flags, add them here.
-        chmod +x reproduce/software/bash/* reproduce/analysis/bash/*
+        chmod +x reproduce/software/shell/* reproduce/analysis/bash/*
 
         # If the user requested, clean the TeX directory from the extra
         # (to-be-built) directories that may already be there (and will not
diff --git a/reproduce/analysis/make/initialize.mk b/reproduce/analysis/make/initialize.mk
index 1137f28..79f9266 100644
--- a/reproduce/analysis/make/initialize.mk
+++ b/reproduce/analysis/make/initialize.mk
@@ -156,9 +156,9 @@ export DYLD_LIBRARY_PATH :=
 # remote-shell accesss through this environment variable.
 export OMPI_MCA_plm_rsh_agent=/bin/false
 
-# Recipe startup script, see `reproduce/software/bash/bashrc.sh'.
+# Recipe startup script.
 export PROJECT_STATUS := make
-export BASH_ENV := $(shell pwd)/reproduce/software/bash/bashrc.sh
+export BASH_ENV := $(shell pwd)/reproduce/software/shell/bashrc.sh
 
 
 
diff --git a/reproduce/software/make/README.md b/reproduce/software/make/README.md
index fc04dfb..d71a3d5 100644
--- a/reproduce/software/make/README.md
+++ b/reproduce/software/make/README.md
@@ -2,7 +2,7 @@ Software building instructions
 ==============================
 
 This directory contains Makefiles that are called by the high-level
-`reproduce/software/bash/configure.sh` script. The main target for the
+`reproduce/software/shell/configure.sh` script. The main target for the
 installation of each software is a simple plain text file that contains the
 name of the software and its version (which is put in the paper in the
 end). Once built, these plain-text files are all put in the proper
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk
index 7e900b8..d08ba62 100644
--- a/reproduce/software/make/basic.mk
+++ b/reproduce/software/make/basic.mk
@@ -74,9 +74,9 @@ export LD_LIBRARY_PATH := $(shell echo $(LD_LIBRARY_PATH):$(ildir) \
 # causes crashs (see bug #56682). So we'll just give it no value at all.
 export DYLD_LIBRARY_PATH :=
 
-# Recipe startup script, see `reproduce/software/bash/bashrc.sh'.
+# Recipe startup script.
 export PROJECT_STATUS := configure_basic
-export BASH_ENV := $(shell pwd)/reproduce/software/bash/bashrc.sh
+export BASH_ENV := $(shell pwd)/reproduce/software/shell/bashrc.sh
 
 # Define the top-level basic programs (that don't depend on any other).
 top-level-programs = low-level-links gcc
@@ -1067,7 +1067,7 @@ $(ibidir)/metastore: $(needlibbsd) \
 	           -e's|@GROUP[@]|'$$group'|g' \
 	           -e's|@BINDIR[@]|$(ibdir)|g' \
 	           -e's|@TOP_PROJECT_DIR[@]|'$$current_dir'|g' \
-	           reproduce/software/bash/git-$$f > .git/hooks/$$f \
+	           reproduce/software/shell/git-$$f > .git/hooks/$$f \
 	       && chmod +x .git/hooks/$$f; \
 	    done; \
 	  fi \
diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk
index 02ae1a5..53bef55 100644
--- a/reproduce/software/make/high-level.mk
+++ b/reproduce/software/make/high-level.mk
@@ -96,9 +96,9 @@ export DYLD_LIBRARY_PATH :=
 # for `ld'.
 export LIBRARY_PATH := $(sys_library_path)
 
-# Recipe startup script, see `reproduce/software/bash/bashrc.sh'.
+# Recipe startup script, see `reproduce/software/shell/bashrc.sh'.
 export PROJECT_STATUS := configure_highlevel
-export BASH_ENV := $(shell pwd)/reproduce/software/bash/bashrc.sh
+export BASH_ENV := $(shell pwd)/reproduce/software/shell/bashrc.sh
 
 # Building flags:
 #
diff --git a/reproduce/software/bash/bashrc.sh b/reproduce/software/shell/bashrc.sh
index b2a151f..b2a151f 100755
--- a/reproduce/software/bash/bashrc.sh
+++ b/reproduce/software/shell/bashrc.sh
diff --git a/reproduce/software/bash/configure.sh b/reproduce/software/shell/configure.sh
index a6fbc4e..a6fbc4e 100755
--- a/reproduce/software/bash/configure.sh
+++ b/reproduce/software/shell/configure.sh
diff --git a/reproduce/software/bash/git-post-checkout b/reproduce/software/shell/git-post-checkout
index f6366dc..f6366dc 100755
--- a/reproduce/software/bash/git-post-checkout
+++ b/reproduce/software/shell/git-post-checkout
diff --git a/reproduce/software/bash/git-pre-commit b/reproduce/software/shell/git-pre-commit
index 9d550db..9d550db 100755
--- a/reproduce/software/bash/git-pre-commit
+++ b/reproduce/software/shell/git-pre-commit