mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Ported installer to correct install path.

Browse source
This commit is contained in:
SamTV12345 2024-03-13 20:48:51 +01:00
parent 78d832ab4b
commit da6a6def65
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/bin/installPlugins.ts → bin/installPlugins.ts
View file

@ -1,10 +1,10 @@
'use strict'; 'use strict';
import {writeFileSync} from 'fs' import {writeFileSync} from 'fs'
import {manager, installedPluginsPath} from "../static/js/pluginfw/installer"; import {manager, installedPluginsPath} from "ep_etherpad-lite/static/js/pluginfw/installer";
import {PackageData} from "../node/types/PackageInfo"; import {PackageData} from "ep_etherpad-lite/node/types/PackageInfo";
const pluginsModule = require('../static/js/pluginfw/plugins'); const pluginsModule = require('ep_etherpad-lite/static/js/pluginfw/plugins');
if (process.argv.length === 2) { if (process.argv.length === 2) {
console.error('Expected at least one argument!'); console.error('Expected at least one argument!');
process.exit(1); process.exit(1);

3
bin/package.json
View file

@ -30,7 +30,8 @@
"migrateDirtyDBtoRealDB": "node --import tsx migrateDirtyDBtoRealDB.ts", "migrateDirtyDBtoRealDB": "node --import tsx migrateDirtyDBtoRealDB.ts",
"rebuildPad": "node --import tsx rebuildPad.ts", "rebuildPad": "node --import tsx rebuildPad.ts",
"stalePlugins": "node --import tsx ./plugins/stalePlugins.ts", "stalePlugins": "node --import tsx ./plugins/stalePlugins.ts",
"checkPlugins": "node --import tsx ./plugins/checkPlugins.ts" "checkPlugins": "node --import tsx ./plugins/checkPlugins.ts",
"install-plugins": "node --import tsx ./installPlugins.ts"
}, },
"author": "", "author": "",
"license": "ISC" "license": "ISC"

2
package.json
View file

@ -23,7 +23,7 @@
"test-ui:ui": "pnpm --filter ep_etherpad-lite run test-ui:ui", "test-ui:ui": "pnpm --filter ep_etherpad-lite run test-ui:ui",
"test-admin": "pnpm --filter ep_etherpad-lite run test-admin", "test-admin": "pnpm --filter ep_etherpad-lite run test-admin",
"test-admin:ui": "pnpm --filter ep_etherpad-lite run test-admin:ui", "test-admin:ui": "pnpm --filter ep_etherpad-lite run test-admin:ui",
"install-plugins": "pnpm --filter ep_etherpad-lite run install-plugins" "install-plugins": "pnpm --filter bin run install-plugins"
}, },
"dependencies": { "dependencies": {
"ep_etherpad-lite": "workspace:./src" "ep_etherpad-lite": "workspace:./src"

1
src/package.json
View file

@ -118,7 +118,6 @@
"test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api", "test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api",
"dev": "node --import tsx node/server.ts", "dev": "node --import tsx node/server.ts",
"prod": "node --import tsx node/server.ts", "prod": "node --import tsx node/server.ts",
"install-plugins": "node --import tsx bin/installPlugins.ts",
"ts-check": "tsc --noEmit", "ts-check": "tsc --noEmit",
"ts-check:watch": "tsc --noEmit --watch", "ts-check:watch": "tsc --noEmit --watch",
"test-ui": "npx playwright test tests/frontend-new/specs", "test-ui": "npx playwright test tests/frontend-new/specs",

6
src/static/js/pluginfw/installer.ts
View file

@ -19,7 +19,11 @@ import {PluginManager} from 'live-plugin-manager-pnpm';
const {findEtherpadRoot} = require('../../../node/utils/AbsolutePaths'); const {findEtherpadRoot} = require('../../../node/utils/AbsolutePaths');
const logger = log4js.getLogger('plugins'); const logger = log4js.getLogger('plugins');
export const manager = new PluginManager(); export const pluginInstallPath = path.join(settings.root, 'src','plugin_packages');
export const manager = new PluginManager({
pluginsPath: pluginInstallPath
});
export const installedPluginsPath = path.join(settings.root, 'var/installed_plugins.json'); export const installedPluginsPath = path.join(settings.root, 'var/installed_plugins.json');