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

Merge branch 'main' into dev

Browse Source
This commit is contained in:
Cohee
2023-06-22 20:51:10 +03:00
parent 2f497cf25b d4332aa7ec
commit c096a55697
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/readme.md vendored
View File

@@ -294,6 +294,7 @@ GNU Affero General Public License for more details.**
* RossAscends' additions: AGPL v3 * RossAscends' additions: AGPL v3
* Portions of CncAnon's TavernAITurbo mod: Unknown license * Portions of CncAnon's TavernAITurbo mod: Unknown license
* kingbri's various commits and suggestions (<https://github.com/bdashore3>) * 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/>) * 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 Pygmalion University for being awesome testers and suggesting cool features!
* Thanks oobabooga for compiling presets for TextGen * Thanks oobabooga for compiling presets for TextGen

4
Start.bat
View File

@@ -1,5 +1,5 @@
pushd %~dp0 pushd %~dp0
call npm install call npm install --no-audit
node server.js node server.js
pause pause
popd popd

16
start.sh
View File

@@ -3,19 +3,19 @@
if ! command -v npm &> /dev/null if ! command -v npm &> /dev/null
then then
read -p "npm is not installed. Do you want to install nodejs and npm? (y/n)" choice read -p "npm is not installed. Do you want to install nodejs and npm? (y/n)" choice
case "$choice" in case "$choice" in
y|Y ) y|Y )
echo "Installing nvm..." echo "Installing nvm..."
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/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" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
source ~/.bashrc source ~/.bashrc
nvm install lts nvm install --lts
nvm use lts;; nvm use --lts;;
n|N ) n|N )
echo "Nodejs and npm will not be installed." echo "Nodejs and npm will not be installed."
exit;; exit;;
* ) * )
echo "Invalid option. Nodejs and npm will not be installed." echo "Invalid option. Nodejs and npm will not be installed."
exit;; exit;;
esac esac
@@ -28,7 +28,7 @@ if [ ! -z "$REPL_ID" ]; then
fi fi
echo "Installing Node Modules..." echo "Installing Node Modules..."
npm i npm i --no-audit
echo "Entering SillyTavern..." echo "Entering SillyTavern..."
node "$(dirname "$0")/server.js" node "$(dirname "$0")/server.js"