From d29df45de9b98f4b3fcd5b93accdcc4ae47eb441 Mon Sep 17 00:00:00 2001
From: Matthias Strubel <matthias.strubel@aod-rpg.de>
Date: Wed, 5 Oct 2016 07:37:56 +0200
Subject: [PATCH] piratebox init: content symlink is not created.

If a content folder is already available, the symlink pointing to
that folder is not created. This results in an issue that
upgrades from 1.1.x to 1.1.x end up in a redirect loop in the
browser.
---
 CHANGELOG                                    | 3 +++
 piratebox/piratebox/bin/install_piratebox.sh | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ee3c1e7..f84b9f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 CHANGELOG
 
+=== 1.1.2 ===
+* [Fix] Upgrade 1.1.x - 1.1.x does not create content symlink
+
 === 1.1.1 ===
 * [Fix] Translation en,fr LibraryBox -> PirateBox
 * [Fix] Spellings in translation
diff --git a/piratebox/piratebox/bin/install_piratebox.sh b/piratebox/piratebox/bin/install_piratebox.sh
index dd8248c..df13f26 100755
--- a/piratebox/piratebox/bin/install_piratebox.sh
+++ b/piratebox/piratebox/bin/install_piratebox.sh
@@ -83,6 +83,9 @@ if [ $2 = 'part2' ] ; then
   
    [ ! -L $PIRATEBOX_FOLDER/www/board  ] && ln -s $PIRATEBOX_FOLDER/share/board $PIRATEBOX_FOLDER/www/board
    [ ! -L $PIRATEBOX_FOLDER/www/Shared ] && ln -s $UPLOADFOLDER  $PIRATEBOX_FOLDER/www/Shared
+   [ ! -L $PIRATEBOX_FOLDER/www/content  ] && \
+       ln -s $WWW_CONTENT  $WWW_FOLDER/content
+
 fi 
 
 #Install the image-board