2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2024-05-26 03:26:56 +02:00

Bugfix friendica console command

- added to every installation type
- fixing the function call parameters
This commit is contained in:
Philipp Holzer 2018-06-02 00:16:37 +02:00
parent 987edd5dae
commit fff22153e4
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
7 changed files with 63 additions and 70 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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