nitowa/fb-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-stuff

Browse Source
This commit is contained in:
peter
2019-08-27 23:18:00 +02:00
parent 700e83ea1b
commit 3392470f6e
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+3 -3
View File
@@ -2123,9 +2123,9 @@
} }
}, },
"frontblock-generic": { "frontblock-generic": {
"version": "0.30.2", "version": "0.30.3",
"resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.30.2.tgz", "resolved": "https://registry.npmjs.org/frontblock-generic/-/frontblock-generic-0.30.3.tgz",
"integrity": "sha512-9dSasjv5pth2j6sCJ1cACfVWjTcDuabu/Nki8OBDXE3z4dljw1HnM5fRR7ncbnk7FAnUJXiMuWNBRqi3At3PLA==", "integrity": "sha512-RvgGaG2Bx9AaCVssu9/ZPGCCWg9FCwMFEa+6ZRyNNPvddh5smE5Yo+59KWDMUHKpMkV25HF6JR6Tl9YwQ82z5Q==",
"requires": { "requires": {
"@types/lowdb": "^1.0.9", "@types/lowdb": "^1.0.9",
"@types/node": "^12.7.1", "@types/node": "^12.7.1",
package.json
+1 -1
View File
@@ -27,7 +27,7 @@
"debug": "^4.1.1", "debug": "^4.1.1",
"express": "^4.16.4", "express": "^4.16.4",
"frontblock": "^0.14.0", "frontblock": "^0.14.0",
"frontblock-generic": "^0.30.2", "frontblock-generic": "^0.30.3",
"git-cherrypicker": "0.0.3", "git-cherrypicker": "0.0.3",
"git-describe": "^4.0.4", "git-describe": "^4.0.4",
"http": "0.0.0", "http": "0.0.0",
src/backend/Admin.ts
+5 -3
View File
@@ -9,7 +9,6 @@ import http = require('http');
import bsock = require('bsock'); import bsock = require('bsock');
import { promises as fs } from "fs" import { promises as fs } from "fs"
import * as path from "path" import * as path from "path"
import { install } from './Installer';
import { FrontblockApi } from 'frontblock-generic/Api'; import { FrontblockApi } from 'frontblock-generic/Api';
import { Plugin } from 'frontblock-generic/Plugin'; import { Plugin } from 'frontblock-generic/Plugin';
import { socketioRPC } from 'frontblock-generic/RPC'; import { socketioRPC } from 'frontblock-generic/RPC';
@@ -89,7 +88,7 @@ export class FrontblockAdmin extends AdminBase<AdminConf>{
{ {
name: 'selfUpdate', name: 'selfUpdate',
type:'call', type:'call',
func: async (force: boolean) => {return this.selfUpdate(force)}, func: async (force: boolean) => {return await this.selfUpdate(force)},
visibility: 'private' visibility: 'private'
}, },
] ]
@@ -101,7 +100,10 @@ export class FrontblockAdmin extends AdminBase<AdminConf>{
if(force || !status.remote || !status.remote.includes("fb-dist/admin") || !status.exists || status.empty || !status.currentTag){ 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!":"")) logger.warn("Cloning fb-dist/admin into ./dist ..."+(force?" USING FORCE!":""))
status = await updater.cloneRepo("https://gitea.frontblock.me/fb-dist/admin.git", 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 return status
} }
src/backend/Installer.ts
+1
View File
@@ -1,4 +1,5 @@
import * as Logger from 'log4js' import * as Logger from 'log4js'
import { Plugin } from "frontblock-generic/Plugin"
var exec = require('child-process-promise').exec; var exec = require('child-process-promise').exec;