diff --git a/package-lock.json b/package-lock.json index 4749495..3d7edb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2123,9 +2123,9 @@ } }, "frontblock-generic": { - "version": "0.30.2", - "resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.30.2.tgz", - "integrity": "sha512-9dSasjv5pth2j6sCJ1cACfVWjTcDuabu/Nki8OBDXE3z4dljw1HnM5fRR7ncbnk7FAnUJXiMuWNBRqi3At3PLA==", + "version": "0.30.3", + "resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.30.3.tgz", + "integrity": "sha512-RvgGaG2Bx9AaCVssu9/ZPGCCWg9FCwMFEa+6ZRyNNPvddh5smE5Yo+59KWDMUHKpMkV25HF6JR6Tl9YwQ82z5Q==", "requires": { "@types/lowdb": "^1.0.9", "@types/node": "^12.7.1", diff --git a/package.json b/package.json index ef33ec9..68044ff 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "debug": "^4.1.1", "express": "^4.16.4", "frontblock": "^0.14.0", - "frontblock-generic": "^0.30.2", + "frontblock-generic": "^0.30.3", "git-cherrypicker": "0.0.3", "git-describe": "^4.0.4", "http": "0.0.0", diff --git a/src/backend/Admin.ts b/src/backend/Admin.ts index 7739028..0673e26 100644 --- a/src/backend/Admin.ts +++ b/src/backend/Admin.ts @@ -9,7 +9,6 @@ import http = require('http'); import bsock = require('bsock'); import { promises as fs } from "fs" import * as path from "path" -import { install } from './Installer'; import { FrontblockApi } from 'frontblock-generic/Api'; import { Plugin } from 'frontblock-generic/Plugin'; import { socketioRPC } from 'frontblock-generic/RPC'; @@ -89,7 +88,7 @@ export class FrontblockAdmin extends AdminBase{ { name: 'selfUpdate', type:'call', - func: async (force: boolean) => {return this.selfUpdate(force)}, + func: async (force: boolean) => {return await this.selfUpdate(force)}, visibility: 'private' }, ] @@ -101,7 +100,10 @@ export class FrontblockAdmin extends AdminBase{ if(force || !status.remote || !status.remote.includes("fb-dist/admin") || !status.exists || status.empty || !status.currentTag){ logger.warn("Cloning fb-dist/admin into ./dist ..."+(force?" USING FORCE!":"")) status = await updater.cloneRepo("https://gitea.frontblock.me/fb-dist/admin.git", force) - // TODO install() + + this.destroy() + const installer = require("./Installer").install + installer(this.getPlugins()) } return status } diff --git a/src/backend/Installer.ts b/src/backend/Installer.ts index dace064..6cc9bb8 100644 --- a/src/backend/Installer.ts +++ b/src/backend/Installer.ts @@ -1,4 +1,5 @@ import * as Logger from 'log4js' +import { Plugin } from "frontblock-generic/Plugin" var exec = require('child-process-promise').exec;