From 67b9c9b033a42f970095b0be4fd8cd2450044704 Mon Sep 17 00:00:00 2001
From: Qiyu8 <fangchunlin@huawei.com>
Date: Fri, 20 May 2022 15:37:03 +0800
Subject: [PATCH] change dos /r/n to unix /n

---
 package/kml/1.4.0/gcc/install.sh     |  1 +
 package/singularity/3.8.4/.keep      |  0
 package/singularity/3.8.4/install.sh | 28 ++++++++++++++--------------
 package/singularity/3.9.6/install.sh |  4 +---
 package/singularity/3.9.9/install.sh | 28 +++++++++++-----------------
 src/dataService.py                   |  3 +--
 src/installService.py                |  4 ++++
 7 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 package/singularity/3.8.4/.keep

diff --git a/package/kml/1.4.0/gcc/install.sh b/package/kml/1.4.0/gcc/install.sh
index 5e0b92d..5368499 100644
--- a/package/kml/1.4.0/gcc/install.sh
+++ b/package/kml/1.4.0/gcc/install.sh
@@ -2,6 +2,7 @@
 set -x
 set -e
 . ${DOWNLOAD_TOOL} -u https://kunpeng-repo.obs.cn-north-4.myhuaweicloud.com/Kunpeng%20BoostKit/Kunpeng%20BoostKit%2021.0.1/BoostKit-kml_1.4.0.zip -f BoostKit-kml_1.4.0-gcc.zip
+. ${DOWNLOAD_TOOL} -u https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz -f lapack-3.9.1.tar.gz
 cd ${JARVIS_TMP}
 if [ -d /usr/local/kml ];then
    rpm -e boostkit-kml
diff --git a/package/singularity/3.8.4/.keep b/package/singularity/3.8.4/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/package/singularity/3.8.4/install.sh b/package/singularity/3.8.4/install.sh
index ec625af..3382f0c 100644
--- a/package/singularity/3.8.4/install.sh
+++ b/package/singularity/3.8.4/install.sh
@@ -1,15 +1,15 @@
-#!/bin/bash
-set -x
-set -e
-cd ${JARVIS_TMP}
-export PATH=/usr/local/go/bin:$PATH
-#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup
-file_noext='singularity-ce-3.8.4'
-file_name="${file_noext}.tar.gz"
-. ${DOWNLOAD_TOOL} -u  https://github.com/sylabs/singularity/releases/download/v3.8.4/${file_name}
-rm -rf ${file_noext}
-tar -xzvf ${JARVIS_DOWNLOAD}/${file_name}
-cd ${file_noext}
-./mconfig
-make -C builddir
+#!/bin/bash
+set -x
+set -e
+cd ${JARVIS_TMP}
+export PATH=/usr/local/go/bin:$PATH
+#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup
+file_noext='singularity-ce-3.8.4'
+file_name="${file_noext}.tar.gz"
+. ${DOWNLOAD_TOOL} -u  https://github.com/sylabs/singularity/releases/download/v3.8.4/${file_name}
+rm -rf ${file_noext}
+tar -xzvf ${JARVIS_DOWNLOAD}/${file_name}
+cd ${file_noext}
+./mconfig
+make -C builddir
 sudo make -C builddir install
\ No newline at end of file
diff --git a/package/singularity/3.9.6/install.sh b/package/singularity/3.9.6/install.sh
index bdaa619..d7bd276 100755
--- a/package/singularity/3.9.6/install.sh
+++ b/package/singularity/3.9.6/install.sh
@@ -6,9 +6,7 @@ export PATH=/usr/local/go/bin:$PATH
 #sudo yum install -y libseccomp-devel squashfs-tools cryptsetup
 file_noext='singularity-ce-3.9.6'
 file_name="${file_noext}.tar.gz"
-if [ ! -f "${JARVIS_DOWNLOAD}/${file_name}" ]; then
-    wget --no-check-certificate -P ${JARVIS_DOWNLOAD} https://github.com/sylabs/singularity/releases/download/v3.9.6/${file_name}
-fi
+. ${DOWNLOAD_TOOL} -u https://github.com/sylabs/singularity/releases/download/v3.9.6/${file_name}
 rm -rf ${file_noext}
 tar -xzvf ${JARVIS_DOWNLOAD}/${file_name}
 cd ${file_noext}
diff --git a/package/singularity/3.9.9/install.sh b/package/singularity/3.9.9/install.sh
index 562d90c..8707927 100644
--- a/package/singularity/3.9.9/install.sh
+++ b/package/singularity/3.9.9/install.sh
@@ -1,22 +1,16 @@
 #!/bin/bash
 set -x
 set -e
-. ${DOWNLOAD_TOOL} -u https://codeload.github.com/sylabs/singularity/tar.gz/refs/tags/v3.9.9 -f singularity-3.9.9.tar.gz
-. ${DOWNLOAD_TOOL} -u https://dl.google.com/go/go1.18.1.linux-arm64.tar.gz
 cd ${JARVIS_TMP}
-tar -xvf ${JARVIS_DOWNLOAD}/singularity-3.9.9.tar.gz
-cd singularity-3.9.9
-tar -xvf ${JARVIS_DOWNLOAD}/go1.18.1.linux-arm64.tar.gz
-export PATH=${JARVIS_TMP}/singularity-3.9.9/go/bin:$PATH
-mkdir build_clang
-sed -i '14c\hstcc=clang' mconfig
-sed -i '16c\hstcxx=clang++' mconfig
-sed -i '26c\tgtcc=clang' mconfig
-sed -i '28c\tgtcxx=clang++' mconfig
-./mconfig -b ./build_clang -p ./bin
-cd ./build_clang
-cp config.h ../cmd/starter/
-sed -i '111c\GOPROXY := https://goproxy.cn' Makefile
-make
-make install
+export PATH=/usr/local/go/bin:$PATH
+#sudo yum install -y libseccomp-devel squashfs-tools cryptsetup
+file_noext='singularity-ce-3.9.9'
+file_name="${file_noext}.tar.gz"
+. ${DOWNLOAD_TOOL} -u https://github.com/sylabs/singularity/releases/download/v3.9.9/${file_name}
+rm -rf ${file_noext}
+tar -xzvf ${JARVIS_DOWNLOAD}/${file_name}
+cd ${file_noext}
+./mconfig
+make -C builddir
+sudo make -C builddir install
 
diff --git a/src/dataService.py b/src/dataService.py
index 5af4359..7f8b46c 100644
--- a/src/dataService.py
+++ b/src/dataService.py
@@ -155,8 +155,7 @@ cd {DataService.build_dir}
 {DataService.clean_cmd}
 '''
     def get_env(self):
-        return f'''set -e
-source ./init.sh
+        return f'''source ./init.sh
 ./jarvis -e
 source ./{DataService.env_file}'''
 
diff --git a/src/installService.py b/src/installService.py
index 8ce23b7..8ddc781 100644
--- a/src/installService.py
+++ b/src/installService.py
@@ -273,6 +273,10 @@ set     version			    {sversion}
         module_file_content = self.get_module_file_content(install_path, sversion)
         if not self.is_installed(install_path):
             return
+        # if install_path is empty, The module file should not generated.
+        if len(os.listdir(install_path)) == 1:
+            print('module file did not generated because no file generated under install path')
+            return
         if stype == SType.MPI:
             compiler_str = cname + cmversion
             module_path = os.path.join(self.MODULE_DEPS_PATH, compiler_str ,software_str)
-- 
Gitee