mirror of
https://github.com/friendica/docker
synced 2024-09-28 00:44:20 +02:00
Merge pull request #18 from nupplaphil/bugfix_friendica_console
Bugfix `friendica console` command
This commit is contained in:
commit
4043b7901d
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
|
@ -95,8 +95,10 @@ friendica_help() {
|
||||||
|
|
||||||
# executes the Friendica console
|
# executes the Friendica console
|
||||||
console() {
|
console() {
|
||||||
|
if [ -f $WORKDIR/bin/console.php ]; then
|
||||||
cd $WORKDIR
|
cd $WORKDIR
|
||||||
php $WORKDIR/bin/console.php "$@"
|
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() {
|
||||||
|
|
Loading…
Reference in a new issue