mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'main' into dev
This commit is contained in:
1
.github/readme.md
vendored
1
.github/readme.md
vendored
@@ -294,6 +294,7 @@ GNU Affero General Public License for more details.**
|
||||
* RossAscends' additions: AGPL v3
|
||||
* Portions of CncAnon's TavernAITurbo mod: Unknown license
|
||||
* kingbri's various commits and suggestions (<https://github.com/bdashore3>)
|
||||
* BlipRanger's miscellaneous UI & extension modifications (<https://github.com/BlipRanger>)
|
||||
* Waifu mode inspired by the work of PepperTaco (<https://github.com/peppertaco/Tavern/>)
|
||||
* Thanks Pygmalion University for being awesome testers and suggesting cool features!
|
||||
* Thanks oobabooga for compiling presets for TextGen
|
||||
|
@@ -1,5 +1,5 @@
|
||||
pushd %~dp0
|
||||
call npm install
|
||||
call npm install --no-audit
|
||||
node server.js
|
||||
pause
|
||||
popd
|
||||
popd
|
||||
|
16
start.sh
16
start.sh
@@ -3,19 +3,19 @@
|
||||
if ! command -v npm &> /dev/null
|
||||
then
|
||||
read -p "npm is not installed. Do you want to install nodejs and npm? (y/n)" choice
|
||||
case "$choice" in
|
||||
y|Y )
|
||||
case "$choice" in
|
||||
y|Y )
|
||||
echo "Installing nvm..."
|
||||
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
|
||||
source ~/.bashrc
|
||||
nvm install lts
|
||||
nvm use lts;;
|
||||
n|N )
|
||||
nvm install --lts
|
||||
nvm use --lts;;
|
||||
n|N )
|
||||
echo "Nodejs and npm will not be installed."
|
||||
exit;;
|
||||
* )
|
||||
* )
|
||||
echo "Invalid option. Nodejs and npm will not be installed."
|
||||
exit;;
|
||||
esac
|
||||
@@ -28,7 +28,7 @@ if [ ! -z "$REPL_ID" ]; then
|
||||
fi
|
||||
|
||||
echo "Installing Node Modules..."
|
||||
npm i
|
||||
npm i --no-audit
|
||||
|
||||
echo "Entering SillyTavern..."
|
||||
node "$(dirname "$0")/server.js"
|
||||
node "$(dirname "$0")/server.js"
|
||||
|
Reference in New Issue
Block a user