修复 linux 依赖是否存在判断

back/config/index.ts

@@ -20,6 +20,7 @@ const rootPath = process.env.QL_DIR as string;
 const envFound = dotenv.config({ path: path.join(rootPath, '.env') });
 
 const dataPath = path.join(rootPath, 'data/');
+const shellPath = path.join(rootPath, 'shell/');
 const tmpPath = path.join(rootPath, '.tmp/');
 const samplePath = path.join(rootPath, 'sample/');
 const configPath = path.join(dataPath, 'config/');
@@ -44,6 +45,7 @@ const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path.join(rootPath, 'version.yaml');
 const dataTgzFile = path.join(tmpPath, 'data.tgz');
+const shareShellFile = path.join(shellPath, 'share.sh');
 
 if (envFound.error) {
   throw new Error("⚠️  Couldn't find .env file  ⚠️");
@@ -64,6 +66,7 @@ export default {
   tmpPath,
   dataPath,
   dataTgzFile,
+  shareShellFile,
   configString,
   loginFaild,
   authError,

back/data/dependence.ts

@@ -43,13 +43,13 @@ export enum DependenceTypes {
 export enum InstallDependenceCommandTypes {
   'pnpm add -g',
   'pip3 install --disable-pip-version-check --root-user-action=ignore',
-  'apk add',
+  'apk add --no-check-certificate',
 }
 
 export enum GetDependenceCommandTypes {
   'pnpm ls -g ',
   'pip3 show --disable-pip-version-check',
-  'apk info',
+  'apk info -es',
 }
 
 export enum versionDependenceCommandTypes {

back/loaders/initData.ts

@@ -38,7 +38,7 @@ export default async () => {
   // 初始化时安装所有处于安装中，安装成功，安装失败的依赖
   DependenceModel.findAll({
     where: {},
-    order: [['type', 'DESC']],
+    order: [['type', 'DESC'], ['createdAt', 'DESC']],
     raw: true,
   }).then(async (docs) => {
     await DependenceModel.update(

back/services/dependence.ts

@@ -209,7 +209,7 @@ export default class DependenceService {
                 ? `${getCommandPrefix} | grep "${depName}" | head -1`
                 : `${getCommandPrefix} ${depName}`,
             )
-          ).replace(/\s{2,}/, ' ');
+          ).replace(/\s{2,}/, ' ').replace(/\s+$/, '');
 
           if (
             depInfo &&
@@ -219,7 +219,7 @@ export default class DependenceService {
             (!depVersion || depInfo.includes(depVersion))
           ) {
             const endTime = dayjs();
-            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
+            const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format(
               'YYYY-MM-DD HH:mm:ss',
             )}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
             this.sockService.sendMessage({
@@ -236,7 +236,7 @@ export default class DependenceService {
           }
         }
 
-        const cp = spawn(`${depRunCommand} ${depName}`, {
+        const cp = spawn(`${depRunCommand} ${dependency.name.trim()}`, {
           shell: '/bin/bash',
         });