Update server dependencies

1 files changed, 24 insertions, 21 deletions

diff --git a/server/tools/peertube-plugins.ts b/server/tools/peertube-plugins.ts
index 05b75fab2..08e8cd713 100644
--- a/server/tools/peertube-plugins.ts
+++ b/server/tools/peertube-plugins.ts
@@ -10,6 +10,7 @@ import { getAdminTokenOrDie, getServerCredentials } from './cli'
 import { PeerTubePlugin } from '../../shared/models/plugins/peertube-plugin.model'
 import { isAbsolute } from 'path'
 import * as CliTable3 from 'cli-table3'
+import commander = require('commander')
 
 program
   .name('plugins')
@@ -33,7 +34,7 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-P --path <path>', 'Install from a path')
   .option('-n, --npm-name <npmName>', 'Install from npm')
-  .action((options) => installPluginCLI(options))
+  .action((options, command) => installPluginCLI(command, options))
 
 program
   .command('update')
@@ -43,7 +44,7 @@ program
   .option('-p, --password <token>', 'Password')
   .option('-P --path <path>', 'Update from a path')
   .option('-n, --npm-name <npmName>', 'Update from npm')
-  .action((options) => updatePluginCLI(options))
+  .action((options, command) => updatePluginCLI(command, options))
 
 program
   .command('uninstall')
@@ -52,7 +53,7 @@ program
   .option('-U, --username <username>', 'Username')
   .option('-p, --password <token>', 'Password')
   .option('-n, --npm-name <npmName>', 'NPM plugin/theme name')
-  .action(options => uninstallPluginCLI(options))
+  .action((options, command) => uninstallPluginCLI(command, options))
 
 if (!process.argv.slice(2).length) {
   program.outputHelp()
@@ -60,6 +61,8 @@ if (!process.argv.slice(2).length) {
 
 program.parse(process.argv)
 
+const options = program.opts()
+
 // ----------------------------------------------------------------------------
 
 async function pluginsListCLI () {
@@ -67,8 +70,8 @@ async function pluginsListCLI () {
   const accessToken = await getAdminTokenOrDie(url, username, password)
 
   let pluginType: PluginType
-  if (program['onlyThemes']) pluginType = PluginType.THEME
-  if (program['onlyPlugins']) pluginType = PluginType.PLUGIN
+  if (options.onlyThemes) pluginType = PluginType.THEME
+  if (options.onlyPlugins) pluginType = PluginType.PLUGIN
 
   const res = await listPlugins({
     url,
@@ -101,27 +104,27 @@ async function pluginsListCLI () {
   process.exit(0)
 }
 
-async function installPluginCLI (options: any) {
-  if (!options['path'] && !options['npmName']) {
+async function installPluginCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+  if (!options.path && !options.npmName) {
     console.error('You need to specify the npm name or the path of the plugin you want to install.\n')
     program.outputHelp()
     process.exit(-1)
   }
 
-  if (options['path'] && !isAbsolute(options['path'])) {
+  if (options.path && !isAbsolute(options.path)) {
     console.error('Path should be absolute.')
     process.exit(-1)
   }
 
-  const { url, username, password } = await getServerCredentials(options)
+  const { url, username, password } = await getServerCredentials(command)
   const accessToken = await getAdminTokenOrDie(url, username, password)
 
   try {
     await installPlugin({
       url,
       accessToken,
-      npmName: options['npmName'],
-      path: options['path']
+      npmName: options.npmName,
+      path: options.path
     })
   } catch (err) {
     console.error('Cannot install plugin.', err)
@@ -132,27 +135,27 @@ async function installPluginCLI (options: any) {
   process.exit(0)
 }
 
-async function updatePluginCLI (options: any) {
-  if (!options['path'] && !options['npmName']) {
+async function updatePluginCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+  if (!options.path && !options.npmName) {
     console.error('You need to specify the npm name or the path of the plugin you want to update.\n')
     program.outputHelp()
     process.exit(-1)
   }
 
-  if (options['path'] && !isAbsolute(options['path'])) {
+  if (options.path && !isAbsolute(options.path)) {
     console.error('Path should be absolute.')
     process.exit(-1)
   }
 
-  const { url, username, password } = await getServerCredentials(options)
+  const { url, username, password } = await getServerCredentials(command)
   const accessToken = await getAdminTokenOrDie(url, username, password)
 
   try {
     await updatePlugin({
       url,
       accessToken,
-      npmName: options['npmName'],
-      path: options['path']
+      npmName: options.npmName,
+      path: options.path
     })
   } catch (err) {
     console.error('Cannot update plugin.', err)
@@ -163,21 +166,21 @@ async function updatePluginCLI (options: any) {
   process.exit(0)
 }
 
-async function uninstallPluginCLI (options: any) {
-  if (!options['npmName']) {
+async function uninstallPluginCLI (command: commander.CommanderStatic, options: commander.OptionValues) {
+  if (!options.npmName) {
     console.error('You need to specify the npm name of the plugin/theme you want to uninstall.\n')
     program.outputHelp()
     process.exit(-1)
   }
 
-  const { url, username, password } = await getServerCredentials(options)
+  const { url, username, password } = await getServerCredentials(command)
   const accessToken = await getAdminTokenOrDie(url, username, password)
 
   try {
     await uninstallPlugin({
       url,
       accessToken,
-      npmName: options['npmName']
+      npmName: options.npmName
     })
   } catch (err) {
     console.error('Cannot uninstall plugin.', err)