Merge branch 'release/4.0.0' into develop

[github/Chocobozzz/PeerTube.git] / server / tools / peertube-plugins.ts

diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index 22a09b77981d88f26a7740cc7b477ea11478b30e..9dd3f08c90095a2d20bf3670a3553c2394c7ffd6 100644 (file)
--- a/server/tools/peertube-plugins.ts
+++ b/server/tools/peertube-plugins.ts
@@ -7,7 +7,7 @@ import { program, Command, OptionValues } from 'commander'
 import { assignToken, buildServer, getServerCredentials } from './cli'
 import { PluginType } from '../../shared/models'
 import { isAbsolute } from 'path'
-import * as CliTable3 from 'cli-table3'
+import CliTable3 from 'cli-table3'
 
 program
   .name('plugins')
@@ -31,6 +31,7 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-P --path <path>', 'Install from a path')
   .option('-n, --npm-name <npmName>', 'Install from npm')
+  .option('--plugin-version <pluginVersion>', 'Specify the plugin version to install (only available when installing from npm)')
   .action((options, command) => installPluginCLI(command, options))
 
 program
@@ -69,7 +70,7 @@ async function pluginsListCLI (command: Command, options: OptionValues) {
   if (options.onlyThemes) pluginType = PluginType.THEME
   if (options.onlyPlugins) pluginType = PluginType.PLUGIN
 
-  const { data } = await server.pluginsCommand.list({ start: 0, count: 100, sort: 'name', pluginType })
+  const { data } = await server.plugins.list({ start: 0, count: 100, sort: 'name', pluginType })
 
   const table = new CliTable3({
     head: [ 'name', 'version', 'homepage' ],
@@ -109,7 +110,7 @@ async function installPluginCLI (command: Command, options: OptionValues) {
   await assignToken(server, username, password)
 
   try {
-    await server.pluginsCommand.install({ npmName: options.npmName, path: options.path })
+    await server.plugins.install({ npmName: options.npmName, path: options.path, pluginVersion: options.pluginVersion })
   } catch (err) {
     console.error('Cannot install plugin.', err)
     process.exit(-1)
@@ -136,7 +137,7 @@ async function updatePluginCLI (command: Command, options: OptionValues) {
   await assignToken(server, username, password)
 
   try {
-    await server.pluginsCommand.update({ npmName: options.npmName, path: options.path })
+    await server.plugins.update({ npmName: options.npmName, path: options.path })
   } catch (err) {
     console.error('Cannot update plugin.', err)
     process.exit(-1)
@@ -158,7 +159,7 @@ async function uninstallPluginCLI (command: Command, options: OptionValues) {
   await assignToken(server, username, password)
 
   try {
-    await server.pluginsCommand.uninstall({ npmName: options.npmName })
+    await server.plugins.uninstall({ npmName: options.npmName })
   } catch (err) {
     console.error('Cannot uninstall plugin.', err)
     process.exit(-1)