From 2bfde40f8d1e66b1544aecdcd77101bc0dd9bdcb Mon Sep 17 00:00:00 2001
From: keke <243768648@qq.com>
Date: Tue, 28 Mar 2023 17:07:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(buildPkg):=20=E5=B8=A6=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E7=9A=84=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=9C=A8UOS=E5=AE=B6=E5=BA=AD=E7=89=8822=E4=B8=8A=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=BF=90=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

buildPkg函数中依赖路径环境变量设置错误
---
 src/job/appmanagerjob.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/job/appmanagerjob.cpp b/src/job/appmanagerjob.cpp
index f0ab98d..79a4e7b 100644
--- a/src/job/appmanagerjob.cpp
+++ b/src/job/appmanagerjob.cpp
@@ -1124,11 +1124,11 @@ qint64 AppManagerJob::getUrlFileSize(QString &url, int tryTimes)
     return size;
 }
 
-bool AppManagerJob::buildPkg(const PkgInfo &pkgInfo, bool withDepend)
+bool AppManagerJob::buildPkg(const PkgInfo &pkgInfo, bool withDepends)
 {
     if (pkgInfo.depends.isEmpty()) {
         qInfo() << Q_FUNC_INFO << pkgInfo.pkgName << "has no depends, use direct build method";
-        withDepend = false;
+        withDepends = false;
     }
 
     //// 1. 清空打包缓存目录文件
@@ -1165,7 +1165,7 @@ bool AppManagerJob::buildPkg(const PkgInfo &pkgInfo, bool withDepend)
     }
 
     // 如果本次连同依赖一起打包
-    if (withDepend) {
+    if (withDepends) {
         //// 2.1 拷贝依赖库的文件
         const QString dependsDirPath = QString("/opt/apps/%1/files/%2-depends")
                 .arg(pkgInfo.pkgName)
@@ -1207,9 +1207,9 @@ bool AppManagerJob::buildPkg(const PkgInfo &pkgInfo, bool withDepend)
         const QString execBashStrFormation = QString(
                     "#!/bin/sh\n"
                     "export LAUNCHER_DEPENDS_LOCATION=%1\n"
-                    "export LD_LIBRARY_PATH=\"${LAUNCHER_DEPENDS_LOCATION}/lib/x86_64-linux-gnu:"
-                    "${LAUNCHER_DEPENDS_LOCATION}/usr/bin:${LAUNCHER_DEPENDS_LOCATION}/usr/lib:"
-                    "${LAUNCHER_DEPENDS_LOCATION}/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH\"\n"
+                    "export LD_LIBRARY_PATH=\"${LAUNCHER_DEPENDS_LOCATION}/lib:"
+                    "${LAUNCHER_DEPENDS_LOCATION}/usr/bin:"
+                    "${LAUNCHER_DEPENDS_LOCATION}/usr/lib:$LD_LIBRARY_PATH\"\n"
                     "\n"
                     "/sbin/ldconfig -p | grep -q libstdc++ || export LD_LIBRARY_PATH="
                     "\"$LD_LIBRARY_PATH:${LAUNCHER_DEPENDS_LOCATION}/libstdc++/\"\n"
@@ -1422,7 +1422,7 @@ bool AppManagerJob::buildPkg(const PkgInfo &pkgInfo, bool withDepend)
 
             // 如果本次连同依赖一起打包，则不需要Depends信息
             if (lineTxt.startsWith("Depends: ")) {
-                if (withDepend) {
+                if (withDepends) {
                     pkgControlInfos.append("Depends(origin): " + lineTxt);
                     pkgControlInfos.append("\n");
                     continue;
-- 
Gitee