Просмотр исходного кода

Fix 'make install' not working correctly

Peter Justin 3 лет назад
Родитель
Сommit
ee8be9aec1
2 измененных файлов с 9 добавлено и 2 удалено
  1. 1 2
      Makefile
  2. 8 0
      flaskbb/cli/main.py

+ 1 - 2
Makefile

@@ -28,8 +28,7 @@ devconfig:dependencies ## Generates a development config
 	flaskbb makeconfig -d
 
 install:dependencies ## Installs the dependencies and FlaskBB
-	@[ -f ./flaskbb.cfg ] || (echo "flaskbb.cfg not found. You can generate a configuration file with 'flaskbb makeconfig'."; exit 1)
-	flaskbb --config ./flaskbb.cfg install
+	flaskbb install
 
 docs: ## Builds the Sphinx docs
 	$(MAKE) -C docs html

+ 8 - 0
flaskbb/cli/main.py

@@ -139,6 +139,14 @@ def install(welcome, force, username, email, password, no_plugins):
     """Installs flaskbb. If no arguments are used, an interactive setup
     will be run.
     """
+    if not current_app.config["CONFIG_PATH"]:
+        click.secho(
+            "[!] No 'flaskbb.cfg' config found. "
+            "You can generate a configuration file with 'flaskbb makeconfig'.",
+            fg="red",
+        )
+        sys.exit(1)
+
     click.secho("[+] Installing FlaskBB...", fg="cyan")
     if database_exists(db.engine.url):
         if force or click.confirm(click.style(