friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-03-13 23:32:58 +01:00
Code Issues Releases Wiki Activity

Merge pull request #22 from nupplaphil/friendica_bugfix

Browse source 
Bugfixing friendica shell script
This commit is contained in:
Hypolite Petovan 2018-06-06 19:30:30 -04:00 • committed by GitHub
commit 8ec144f1bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}

7
2018.05/apache/bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}

7
2018.05/fpm-alpine/bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}

7
2018.05/fpm/bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}

7
2018.08-dev/apache/bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}

7
2018.08-dev/fpm-alpine/bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}

7
2018.08-dev/fpm/bin/friendica
View file

@ -140,7 +140,8 @@ copy_sources() {
exit 1;
fi
if version_greater "$image_version" "$installed_version"; then
if version_greater "$image_version" "$installed_version" ||
echo "$image_version" | grep -Eq '^.*\-dev'; then
if [ "$(id -u)" -eq 0 ]; then
rsync_options="-rlDog --chown=www-data:root"
else
@ -148,10 +149,10 @@ copy_sources() {
fi
log 'Copying Friendica sources ('$image_version') from '\'$SOURCEDIR'/friendica'\'' to '\'$WORKDIR\'
rsync $rsync_options --delete --exclude=.git --exclude=photo --exclude=proxy --exclude=.htconfig.php $SOURCEDIR/friendica/ $WORKDIR/
rsync $rsync_options --delete --exclude='.git' --exclude='photo' --exclude='proxy' --exclude='.htconfig.php' --exclude='home.*' --exclude='vendor' $SOURCEDIR/friendica/ $WORKDIR/
if [ -f $WORKDIR/view/smarty3 ]; then
chmod 777 $WORKDIR/view/smarty3
chmod -R 777 $WORKDIR/view/smarty3
fi
fi
}