diff --git a/install.sh b/install.sh index 1d449e6..60e1c7d 100755 --- a/install.sh +++ b/install.sh @@ -49,12 +49,15 @@ install_reflect() { exit 1 fi - if ! [ -d "reflect" ] ; then - git submodule add https://codeberg.org/reflect/reflect - fi + # Download and install the Reflect repository + if [[ "$install" != "n" ]]; then + if ! [ -d "reflect" ] ; then + git submodule add https://codeberg.org/reflect/reflect + fi - # Update submodules - git submodule update --init --recursive + # Update submodules + git submodule update --init --recursive + fi # Install dependencies with composer (cd reflect && composer install --classmap-authoritative) @@ -62,7 +65,14 @@ install_reflect() { # Bail out if composer didn't create a vendor folder if ! [ -d "reflect/vendor" ] ; then echo_err "Something went wrong with the installation." - exit_report + + # Script was not run with the install flag disabled, this is probably a bug + if [[ "$install" != "n" ]]; then + exit_report + fi + + echo_err "Make sure you have cloned the Reflect repository. Or run without '--install=n'." + exit 1 fi } @@ -200,11 +210,7 @@ main() { check_sys_depend - # Download and install the Reflect repository - if [[ "$install" != "n" ]]; then - install_reflect - fi - + install_reflect configure_reflect echo