@whyour/qinglong 0.7.3 → 0.7.5

package/docker/Dockerfile

@@ -33,6 +33,7 @@ COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_module
 
 RUN set -x && \
   ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm && \
+  sed -i 's/deb.debian.org/mirrors.aliyun.com/g' /etc/apt/sources.list && \
   apt update && \
   apt upgrade -y && \
   apt install --no-install-recommends -y git \

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whyour/qinglong",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "Timed task management platform supporting Python3, JavaScript, Shell, Typescript",
   "repository": {
     "type": "git",

package/shell/check.sh

@@ -79,8 +79,6 @@ main() {
   npm i -g pnpm@8.3.1
   patch_version
 
-  apt install -y procps netcat-openbsd
-
   if [[ $PipMirror ]]; then
     pip3 config set global.index-url $PipMirror
   fi

package/static/build/config/index.js

@@ -20,6 +20,7 @@ const lastVersionFile = `https://qn.whyour.cn/version.yaml`;
 const rootPath = process.env.QL_DIR;
 const envFound = dotenv_1.default.config({ path: path_1.default.join(rootPath, '.env') });
 let dataPath = path_1.default.join(rootPath, 'data/');
+const shellPath = path_1.default.join(rootPath, 'shell/');
 const tmpPath = path_1.default.join(rootPath, '.tmp/');
 if (process.env.QL_DATA_DIR) {
     dataPath = process.env.QL_DATA_DIR;
@@ -45,6 +46,7 @@ const loginFaild = '请先登录!';
 const configString = 'config sample crontab shareCode diy';
 const versionFile = path_1.default.join(rootPath, 'version.yaml');
 const dataTgzFile = path_1.default.join(tmpPath, 'data.tgz');
+const shareShellFile = path_1.default.join(shellPath, 'share.sh');
 if (envFound.error) {
     throw new Error("⚠️  Couldn't find .env file  ⚠️");
 }
@@ -63,6 +65,7 @@ exports.default = {
     tmpPath,
     dataPath,
     dataTgzFile,
+    shareShellFile,
     configString,
     loginFaild,
     authError,

package/static/build/services/dependence.js

@@ -28,6 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const typedi_1 = require("typedi");
 const winston_1 = __importDefault(require("winston"));
+const config_1 = __importDefault(require("../config"));
 const dependence_1 = require("../data/dependence");
 const cross_spawn_1 = require("cross-spawn");
 const sock_1 = __importDefault(require("./sock"));
@@ -169,14 +170,14 @@ let DependenceService = class DependenceService {
                     const isPythonDependence = dependency.type === dependence_1.DependenceTypes.python3;
                     const depInfo = (await (0, util_1.promiseExecSuccess)(isNodeDependence
                         ? `${getCommandPrefix} | grep "${depName}" | head -1`
-                        : `${getCommandPrefix} ${depName}`)).replace(/\s{2,}/, ' ');
+                        : `${getCommandPrefix} ${depName}`)).replace(/\s{2,}/, ' ').replace(/\s+$/, '');
                     if (depInfo &&
                         ((isNodeDependence && ((_a = depInfo.split(' ')) === null || _a === void 0 ? void 0 : _a[0]) === depName) ||
                             (isLinuxDependence && depInfo.toLocaleLowerCase().includes('installed')) ||
                             isPythonDependence) &&
                         (!depVersion || depInfo.includes(depVersion))) {
                         const endTime = (0, dayjs_1.default)();
-                        const _message = `检测到已经安装 ${depName}\n\n${depInfo}\n跳过安装\n\n依赖${actionText}成功，结束时间 ${endTime.format('YYYY-MM-DD HH:mm:ss')}，耗时 ${endTime.diff(startTime, 'second')} 秒`;
+                        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({
                             type: socketMessageType,
                             message: _message,
@@ -187,7 +188,7 @@ let DependenceService = class DependenceService {
                         return resolve(null);
                     }
                 }
-                const cp = (0, cross_spawn_1.spawn)(`${depRunCommand} ${dependency.name.trim()}`, {
+                const cp = (0, cross_spawn_1.spawn)(`source ${config_1.default.shareShellFile} && ${depRunCommand} ${dependency.name.trim()}`, {
                     shell: '/bin/bash',
                 });
                 cp.stdout.on('data', async (data) => {