From f1bf64a8ff57d7ae03727c23086c7f8103640cd8 Mon Sep 17 00:00:00 2001 From: Julien Desrosiers Date: Sat, 1 Feb 2025 13:21:36 -0500 Subject: [PATCH] If we follow the installation doc, it says to clone the addon repo inside this dir which would fail if said dir exist and is not empty. --- .gitignore | 4 ---- addon/.gitkeep | 0 doc/Install.md | 20 +++++++++++--------- 3 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 addon/.gitkeep diff --git a/.gitignore b/.gitignore index ac58473600..bfc5094d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -72,11 +72,7 @@ venv/ /.idea #ignore addons directory -/addons /addon -# except those: -!/addons/.gitkeep -!/addon/.gitkeep #ignore base .htaccess /.htaccess diff --git a/addon/.gitkeep b/addon/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/doc/Install.md b/doc/Install.md index 68bc934776..cb4b2de33d 100644 --- a/doc/Install.md +++ b/doc/Install.md @@ -76,14 +76,6 @@ This makes the software much easier to update. The Linux commands to clone the repository into a directory "mywebsite" would be git clone https://github.com/friendica/friendica.git -b stable mywebsite - cd mywebsite - bin/composer.phar install --no-dev - -Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case *www-data* - - mkdir -p view/smarty3 - chown www-data:www-data view/smarty3 - chmod 775 view/smarty3 Get the addons by going into your website folder. @@ -91,7 +83,17 @@ Get the addons by going into your website folder. Clone the addon repository (separately): - git clone https://github.com/friendica/friendica-addons.git -b stable addon + git clone https://github.com/friendica/friendica-addons.git -b stable addon + +Install the dependencies: + + bin/composer.phar install --no-dev + +Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case *www-data* + + mkdir -p view/smarty3 + chown www-data:www-data view/smarty3 + chmod 775 view/smarty3 If you want to use the development version of Friendica you can switch to the develop branch in the repository by running