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.

diff --git a/.gitignore b/.gitignore
index ac58473600b69bf581c0af5ec702c4f0f88456f0..bfc5094d9ad15131b11dcfef730629ac399c4ecb 100644 (file)
--- 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 (file)
index e69de29..0000000

diff --git a/doc/Install.md b/doc/Install.md
index 68bc934776cb563cffeb9db4ba2156901ab73ee9..cb4b2de33d516e42adbd0ee8bbd544ef3e748dc7 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -76,7 +76,17 @@ 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
+
+Get the addons by going into your website folder.
+
     cd mywebsite
+
+Clone the addon repository (separately):
+
+       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*
@@ -85,14 +95,6 @@ Make sure the folder *view/smarty3* exists and is writable by the webserver user
     chown www-data:www-data view/smarty3
     chmod 775 view/smarty3
 
-Get the addons by going into your website folder.
-
-    cd mywebsite
-
-Clone the addon repository (separately):
-
-    git clone https://github.com/friendica/friendica-addons.git -b stable addon
-
 If you want to use the development version of Friendica you can switch to the develop branch in the repository by running
 
     git checkout develop