diff --git a/.gitignore b/.gitignore index 3a673832bd..bfc5094d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -72,7 +72,6 @@ venv/ /.idea #ignore addons directory -/addons /addon #ignore base .htaccess 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