From 5cd71f9f110628e27815032e4e9cd4125e2d059f Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Mon, 19 Oct 2020 13:43:35 -0600
Subject: [PATCH] deploy_modulefiles.sh.in: add '' after -i for each of the sed
 commands to avoid writing the NCEPLIBS .lua-e file (macOS only)

---
 deploy_modulefiles.sh.in | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/deploy_modulefiles.sh.in b/deploy_modulefiles.sh.in
index c284c66..d8137ae 100755
--- a/deploy_modulefiles.sh.in
+++ b/deploy_modulefiles.sh.in
@@ -14,6 +14,13 @@ DFLAT="@FLAT@"
 
 [[ $DFLAT == "ON" ]] && FLAT="Y" || FLAT="N"
 
+# Account for differences in the sed command on Linux and macOS
+if [[ "@CMAKE_SYSTEM_NAME@" == "Darwin" ]]; then
+  sedI="-i ''"
+else
+  sedI="-i"
+fi
+
 # All module load commands for the umbrella module
 moduleLoadCommands=""
 
@@ -52,7 +59,7 @@ for libName in $(ls -1 $tmplModulefilesDir); do
   repl=$(echo ${prefix} | sed -e "s#/#\\\/#g")
 
   # Replace #NCEPLIBS_ROOT# from template with $nceplibsInstallDir
-  sed -i -e "s/#NCEPLIBS_ROOT#/${repl}/g" $dstModulefile
+  sed $sedI -e "s/#NCEPLIBS_ROOT#/${repl}/g" $dstModulefile
 
   # Add to module load commands for umbrella module
   moduleLoadCommands="${moduleLoadCommands}
@@ -74,22 +81,19 @@ mkdir -p $modulesDestDir/NCEPLIBS
 
 # Replace #NCEPLIBS_ROOT# from template with $nceplibsInstallDir
 repl=$(echo ${nceplibsInstallDir} | sed -e "s#/#\\\/#g")
-sed -i -e "s/#NCEPLIBS_ROOT#/${repl}/g" $dstModulefile
+sed $sedI -e "s/#NCEPLIBS_ROOT#/${repl}/g" $dstModulefile
 
 # Set compiler environment variables for the umbrella modulefile
 repl=$(echo "@CMAKE_C_COMPILER@" | sed -e "s#/#\\\/#g")
-sed -i -e "s/#CC#/${repl}/g" $dstModulefile
+sed $sedI -e "s/#CC#/${repl}/g" $dstModulefile
 repl=$(echo "@CMAKE_CXX_COMPILER@" | sed -e "s#/#\\\/#g")
-sed -i -e "s/#CXX#/${repl}/g" $dstModulefile
+sed $sedI -e "s/#CXX#/${repl}/g" $dstModulefile
 repl=$(echo "@CMAKE_Fortran_COMPILER@" | sed -e "s#/#\\\/#g")
-sed -i -e "s/#FC#/${repl}/g" $dstModulefile
+sed $sedI -e "s/#FC#/${repl}/g" $dstModulefile
 
 # Append all module load commands to umbrella module
 echo "${moduleLoadCommands}" >> $dstModulefile
 
-# Temporary workaround: if exists, remove .lua-e file that gets created by sed for a reason I don't understand
-rm -vf ${dstModulefile}-e
-
 echo "Done deploying modules ..."
 
 echo "Generating shell scripts ..."