From 2411bed1201f45a6342496f8c9462ae52761d9c1 Mon Sep 17 00:00:00 2001
From: sssssddd <974446133@qq.com>
Date: Thu, 9 Jun 2022 22:07:09 +0800
Subject: [PATCH] =?UTF-8?q?flye=E5=BB=BA=E4=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LifeSciences/flye-2.9/build.sh    | 2 +-
 LifeSciences/flye-2.9/common.sh   | 4 ----
 LifeSciences/flye-2.9/flye-2.9.sh | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/LifeSciences/flye-2.9/build.sh b/LifeSciences/flye-2.9/build.sh
index e72655c9..137be8bc 100644
--- a/LifeSciences/flye-2.9/build.sh
+++ b/LifeSciences/flye-2.9/build.sh
@@ -62,7 +62,7 @@ function main() {
   buildpath=$(create_dir "$1")
   installpath=$(create_dir "$2")
   dep_dir=$(get_current_dir)/dependency
-  pkg_dir=$(trim_path "$1")/pkg
+  pkg_dir=$(get_current_dir)/pkg
   install_development
   install_bisheng "$dep_dir" "$buildpath" "$installpath"
   install_flye "$buildpath" "$installpath" "$pkg_dir" "$(get_current_dir)"
diff --git a/LifeSciences/flye-2.9/common.sh b/LifeSciences/flye-2.9/common.sh
index 2b904623..4f83767e 100644
--- a/LifeSciences/flye-2.9/common.sh
+++ b/LifeSciences/flye-2.9/common.sh
@@ -44,7 +44,3 @@ function get_current_dir() {
   current_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
   echo "${current_dir}"
 }
-
-function trim_path() {
-  cd "$1"/.. && echo "$PWD"
-}
diff --git a/LifeSciences/flye-2.9/flye-2.9.sh b/LifeSciences/flye-2.9/flye-2.9.sh
index 4de38ed6..6917a34c 100644
--- a/LifeSciences/flye-2.9/flye-2.9.sh
+++ b/LifeSciences/flye-2.9/flye-2.9.sh
@@ -26,11 +26,11 @@ function install_flye() {
   cd "$1"/Flye-2.9
   cp $(get_current_dir)/python.default.patch ./
   patch -p2 <python.default.patch &>/dev/null
-  CC=clang CXX=clang++ python setup.py install --prefix="$2"/flye-2.9 >make.log 2>&1
+  CC=clang CXX=clang++ python setup.py install --prefix="$2"/flye-2.9  > $(get_current_dir)/make.log 2>&1
   if [[ $? -eq 0 ]]; then
-    echo -e "\033[1;32;1m# FLYE已经安装成功\033[0m"
+    echo -e "\033[1;32;1m# FLYE已经安装成功,编译详情请查看$(get_current_dir)/make.log\033[0m"
   else
-    echo -e "\033[31m# FLYE安装失败,请查看$1/Flye-2.9/make.log\033[0m"
+    echo -e "\033[31m# FLYE安装失败,请查看$(get_current_dir)/make.log\033[0m"
     exit 1
   fi
 }
-- 
Gitee