friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-06-19 18:59:26 +02:00
Code Issues 1 Releases Wiki Activity

Merge pull request #18 from nupplaphil/bugfix_friendica_console

Browse source 
Bugfix `friendica console` command
This commit is contained in:
Hypolite Petovan 2018-06-01 22:49:15 -04:00 committed by GitHub
parent 987edd5dae fff22153e4
commit 4043b7901d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.bin/friendica
View file

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {

19
2018.05/apache/bin/friendica
View file

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {

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

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {

19
2018.05/fpm/bin/friendica
View file

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {

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

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {

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

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {

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

@ -95,8 +95,10 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd $WORKDIR if [ -f $WORKDIR/bin/console.php ]; then
php $WORKDIR/bin/console.php "$@" cd $WORKDIR
php $WORKDIR/bin/console.php "$@"
fi
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -157,15 +159,13 @@ install() {
copy_sources copy_sources
log 'Installing Friendica' log 'Installing Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then composer install
composer "install"
fi
if [ ! -f ${WORKDIR}/.htconfig.php ] && if [ ! -f ${WORKDIR}/.htconfig.php ] &&
[ -f ${SOURCEDIR}/config/htconfig.php ] && [ -f ${SOURCEDIR}/config/htconfig.php ] &&
"$AUTOINSTALL" == "true"; then "$AUTOINSTALL" == "true"; then
run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php" run_as "cp ${SOURCEDIR}/config/htconfig.php ${WORKDIR}/.htconfig.php"
console "autoinstall -f .htconfig.php" console autoinstall -f .htconfig.php
# TODO Workaround because of a strange permission issue # TODO Workaround because of a strange permission issue
rm -fr ${WORKDIR}/view/smarty3/compiled rm -fr ${WORKDIR}/view/smarty3/compiled
fi fi
@ -181,10 +181,9 @@ update() {
copy_sources copy_sources
log 'Upgrading Friendica' log 'Upgrading Friendica'
if echo "$FRIENDICA_VERSION" | grep -Eq '^.*(\-dev|-rc)'; then
composer "install" composer install
fi console dbstructure update
console "dbstructure update"
} }
sendmail() { sendmail() {