From a2b303310736ff8658054298d405bc86de172c96 Mon Sep 17 00:00:00 2001 From: RBNXI <35869848+RBNXI@users.noreply.github.com> Date: Wed, 10 Aug 2022 12:31:30 +0000 Subject: [PATCH] Fixed install_without_dependencies.sh script ## Description Removed auto generation of Handbook since with the new versions GC won't exit when finished generating it, so the script was stuck, and for some reason if you stop GC manually, the script won't continue. Added a recommendation to generate HB manually. ## Type of changes - [x] Bug fix - [ ] New feature - [x] Enhancement - [ ] Documentation ## Checklist: - [x] My code follows the style guidelines of this project - [x] My pull request is unique and no other pull requests have been opened for these changes - [x] I have read the [Contributing note](https://github.com/Grasscutters/Grasscutter/blob/stable/CONTRIBUTING.md) and [Code of conduct](https://github.com/Grasscutters/Grasscutter/blob/development/CODE_OF_CONDUCT.md) - [x] I am responsible for any copyright issues with my code if it occurs in the future. --- install_without_dependencies.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install_without_dependencies.sh b/install_without_dependencies.sh index f87ba2a16..792d6d241 100644 --- a/install_without_dependencies.sh +++ b/install_without_dependencies.sh @@ -44,7 +44,7 @@ echo "If you are using version > 2.8 of the client, make sure to use the patched echo "Search for METADATA here: https://discord.gg/grasscutter." echo "" echo "#################################" - +echo "You can find plugins here: https://discord.com/channels/965284035985305680/970830969919664218" echo "" echo "Grasscutter will be installed to script's running directory" echo "Do you wish to proceed and install Grasscutter?" @@ -127,15 +127,12 @@ echo "Building grasscutter.jar done!" cd .. # Generate handbook/config -echo "Grasscutter will be started to generate its data files" -echo "Please enter language for GM handbook when prompted" -echo "Grasscutter will stop once GM handbook is generated" -java -jar grasscutter.jar -handbook +echo "Grasscutter will be started to generate data files" +java -jar grasscutter.jar -version # Replaces "127.0.0.1" with given IP echo "Replacing IP address in server config..." sed -i "s/127.0.0.1/$SERVER_IP/g" config.json - # Generates new keystore.p12 with the server's IP address # This is done to prevent a "Connection Timed Out" error from appearing # after clicking to enter the door in the main menu/title screen @@ -207,7 +204,7 @@ if [ $SUDO_USER ]; then chown -R $SUDO_USER:$SUDO_USER ./* fi -echo "Asking Noelle to clean up..." +echo "Removing unnecessary files..." rm -rf ./certs ./Grasscutter-src echo "All done!" @@ -215,7 +212,10 @@ echo "-=-=-=-=-=--- !! IMPORTANT !! ---=-=-=-=-=-" echo "Please make sure that ports 80, 443, 8888 and 22102 are OPEN (both tcp and udp)" echo "In order to run the server, run the following command:" echo " sudo java -jar grasscutter.jar" +echo "Also remember that you can generate the Handbook with:" +echo " sudo java -jar grasscutter.jar -handbook" echo "You must run it using sudo as port 443 is a privileged port" echo "To play, use the IP you provided earlier ($SERVER_IP) via GrassClipper or Fiddler" +echo "" exit