diff --git a/LifeSciences/flye-2.9/build.sh b/LifeSciences/flye-2.9/build.sh index 137be8bcba2e754bc1f63967be351efbf91cbf46..6d07090abfb79b4bafececeaa16e30e1907f04d6 100644 --- a/LifeSciences/flye-2.9/build.sh +++ b/LifeSciences/flye-2.9/build.sh @@ -9,7 +9,6 @@ # 使用build.sh 需要root权限或者sudo权限,否则无法安装依赖 # ############################################################## -set -e source "$( cd "$(dirname "$0")" || exit 1 @@ -19,7 +18,8 @@ source "$( function write_flye_run() { cat >"$1/flye-2.9-hpc/run.sh" < /dev/null current_dir="\$(cd "\$(dirname "\${BASH_SOURCE[0]}")" && pwd -P)" @@ -52,7 +52,8 @@ function tar_pkg() { } function install_development() { - sudo yum install -y time patch environment-modules zlib-devel zlib bc gcc-c++ + yum -y install sudo + sudo yum install -y m4 systemd-devel automake autoconf libtool make time patch environment-modules zlib-devel zlib bc gcc-c++ source /etc/profile module purge } @@ -64,6 +65,7 @@ function main() { dep_dir=$(get_current_dir)/dependency pkg_dir=$(get_current_dir)/pkg install_development + set -e install_bisheng "$dep_dir" "$buildpath" "$installpath" install_flye "$buildpath" "$installpath" "$pkg_dir" "$(get_current_dir)" write_flye_run "$pkg_dir" diff --git a/LifeSciences/flye-2.9/dependency/bisheng-compiler-2.1.0.sh b/LifeSciences/flye-2.9/dependency/bisheng-compiler-2.1.0.sh index 6e7a2179b4b2af39bb6b4fe4948355e979e973b5..7dba0cffce4de23441d2e042a28b462dbfb739b4 100644 --- a/LifeSciences/flye-2.9/dependency/bisheng-compiler-2.1.0.sh +++ b/LifeSciences/flye-2.9/dependency/bisheng-compiler-2.1.0.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -e source "$( cd "$(dirname "$0")" || exit 1 @@ -51,6 +50,7 @@ function main() { is_check_build_install_directory "$1" "$2" "bisheng-compiler-2.1.0.sh" is_check_build_equal "$1" "$2" install_development + set -e download_bisheng "$1" install_bisheng "$1" "$2" write_bisheng_module "$2" diff --git "a/LifeSciences/flye-2.9/doc/Flye-2.9\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" "b/LifeSciences/flye-2.9/doc/Flye-2.9\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" index 3a30910a3bc4265da4b483526c2bf3f356a5cc07..0a28a444dca0b15bb8eb4560b4435494111eb9fd 100644 Binary files "a/LifeSciences/flye-2.9/doc/Flye-2.9\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" and "b/LifeSciences/flye-2.9/doc/Flye-2.9\345\272\224\347\224\250\347\247\273\346\244\215\346\214\207\345\215\227.docx" differ diff --git a/LifeSciences/flye-2.9/flye-2.9.sh b/LifeSciences/flye-2.9/flye-2.9.sh index 6917a34c90a8f2f604600330ba782b9c15113a9d..419b9c32e9ac48681f18feb0aeb629909a7744c5 100644 --- a/LifeSciences/flye-2.9/flye-2.9.sh +++ b/LifeSciences/flye-2.9/flye-2.9.sh @@ -55,7 +55,6 @@ EOF } function main() { - set -e is_check_build_install_directory "$1" "$2" "flye-2.9.sh" is_check_build_equal "$1" "$2" install_development