rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for git command before running

Browse Source
This commit is contained in:
SillyLossy
2023-05-09 17:55:42 +03:00
parent 9bdceabdf9
commit 5c7e7ba83a
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server.js
View File

@ -58,6 +58,7 @@ const DeviceDetector = require("device-detector-js");
const { TextEncoder, TextDecoder } = require('util');
const utf8Encode = new TextEncoder();
const utf8Decode = new TextDecoder('utf-8', { ignoreBOM: true });
const commandExistsSync = require('command-exists').sync;
const config = require(path.join(__dirname, './config.conf'));
const server_port = process.env.SILLY_TAVERN_PORT || config.port;
@ -310,9 +311,14 @@ app.get('/version', function (_, response) {
try {
const pkgJson = require('./package.json');
pkgVersion = pkgJson.version;
gitRevision = require('child_process')
.execSync('git rev-parse --short HEAD', { cwd: __dirname })
.toString().trim();
if (commandExistsSync('git')) {
gitRevision = require('child_process')
.execSync('git rev-parse --short HEAD', { cwd: __dirname })
.toString().trim();
}
}
catch {
// suppress exception
}
finally {
response.send(`SillyTavern:${gitRevision || pkgVersion}:Cohee#1207`)