From 281400bb26b3a87131c8bc1cc2cc74ece32ca7d0 Mon Sep 17 00:00:00 2001 From: Papa Dragon Date: Tue, 27 Dec 2022 01:03:15 +0100 Subject: [PATCH] As the easyinstall folder was moved to contrib, a few things needed to be changed --- contrib/easyinstall/INSTALL.md | 2 +- contrib/easyinstall/server-setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/easyinstall/INSTALL.md b/contrib/easyinstall/INSTALL.md index c4c79bdc1..745af9f32 100644 --- a/contrib/easyinstall/INSTALL.md +++ b/contrib/easyinstall/INSTALL.md @@ -22,7 +22,7 @@ This first creates the directory where your web server will find the install fol This will download all the software you need in /var/www/mywebsite. You can replace "mywebsite" with any name you like (which you'll have to do if you plan to have more than one website running on your system) - cd website/.easyinstall + cd website/contrib/easyinstall This brings you to the subfolder where the tools are available, i.e. the setup script. diff --git a/contrib/easyinstall/server-setup.sh b/contrib/easyinstall/server-setup.sh index 74c533566..ff483990b 100755 --- a/contrib/easyinstall/server-setup.sh +++ b/contrib/easyinstall/server-setup.sh @@ -706,7 +706,7 @@ check_sanity repo_name print_info "We're installing a website using the $repository repository" -install_path="$(dirname "$(pwd)")" +install_path="$(dirname $(dirname "$(pwd)"))" install_folder="$(basename $install_path)" domain_regex="^([a-zA-Z0-9][a-zA-Z0-9-]{0,61}[a-zA-Z0-9]\.)+[a-zA-Z]{2,}$" local_regex="^([a-zA-Z0-9]){2,25}$"