From bfb793a483588d5e4bce6c0ee0b1eb4651ee70df Mon Sep 17 00:00:00 2001
From: Kent Milfeld <milfeld@tacc.utexas.edu>
Date: Thu, 12 Nov 2020 11:43:51 -0600
Subject: [PATCH] Issue #59: fixed full name extractor in install.sh for
 sysstat and mpiP tar name.

---
 install.sh | 6 ++++--
 src/remora | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/install.sh b/install.sh
index cd0a28e..ae08028 100755
--- a/install.sh
+++ b/install.sh
@@ -60,7 +60,8 @@ echo             | tee -a $BUILD_LOG
 #Now build mpstat
 echo "Building mpstat ..." | tee -a $BUILD_LOG
 cd $REMORA_BUILD_DIR/extra
-sysfile=`ls -ld sysstat*.tar.gz | awk '{print $9}' | head -n 1`
+#sysfile=`ls -ld sysstat*.tar.gz | awk '{print $9}' | head -n 1`
+sysfile=`ls sysstat*.tar.gz`
 sysdir=`echo  ${sysfile%%.tar.gz}`
 tar xzvf ${sysfile}
 cd ${sysdir}
@@ -123,7 +124,8 @@ if [[ "$haveMPICC" == "1" && "$haveMPIFC"  == "1" ]]; then
 
       echo "Building mpiP ..." | tee -a $BUILD_LOG
       cd $REMORA_BUILD_DIR/extra
-      mpipfile=`ls -ld mpiP*.tar.gz | awk '{print $9}' | head -n 1`
+     #mpipfile=`ls -ld mpiP*.tar.gz | awk '{print $9}' | head -n 1`
+      mpipfile=`ls  mpiP*.tar.gz`
       mpipdir=`echo  ${mpipfile%%.tar.gz}`
       tar xzvf ${mpipfile}
       cd ${mpipdir}
diff --git a/src/remora b/src/remora
index 050f7bd..76fe876 100755
--- a/src/remora
+++ b/src/remora
@@ -45,6 +45,7 @@
 #
 #========================================================================
 #  HISTORY
+#       2020/11/12  Fixed ls cmd for sysstat and mpiP full name #57 issue (Kent)
 #       2020/11/12  change >& file to >file 2>&1 in install.sh (Kent)
 #       2020/11/11  No FS rates reported if ...(fs)_rate.txt not avail (Kent)
 #       2020/10/16  For Remora-provided mpiP, includes coeff of Variation(Kent)