friendica/docker
2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-04-27 09:21:36 +02:00
Code Issues Releases Wiki Activity

friendica cli improvement

Browse source 
`friendica update` now pulls the latest git changes of the develop-branch
This commit is contained in:
Philipp Holzer 2018-05-20 16:34:47 +02:00
parent 2125efd5f6
commit 7e2bfa10c4
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
6 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
develop/apache/bin/friendica
View file

@ -54,7 +54,8 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd ${WORKDIR} cd ${WORKDIR}
php "${WORKDIR}/bin/console.php" "$@" # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
php "${WORKDIR}/bin/console.php" $@
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -70,15 +71,16 @@ copy_sources() {
installed_version="$(cat ${WORKDIR}/VERSION)" installed_version="$(cat ${WORKDIR}/VERSION)"
fi fi
if [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
fi
image_version="0.0.0.0" image_version="0.0.0.0"
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)" image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
else else
# no given installation and not using the developer branch => nothing to do # no given installation and not using the developer branch => nothing to do
echo "Friendica command '$1' failed, because of no valid combination of source and version" echo "Friendica command '$1' failed, because of no version found"
return; return;
fi fi

12
develop/fpm-alpine/bin/friendica
View file

@ -54,7 +54,8 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd ${WORKDIR} cd ${WORKDIR}
php "${WORKDIR}/bin/console.php" "$@" # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
php "${WORKDIR}/bin/console.php" $@
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -70,15 +71,16 @@ copy_sources() {
installed_version="$(cat ${WORKDIR}/VERSION)" installed_version="$(cat ${WORKDIR}/VERSION)"
fi fi
if [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
fi
image_version="0.0.0.0" image_version="0.0.0.0"
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)" image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
else else
# no given installation and not using the developer branch => nothing to do # no given installation and not using the developer branch => nothing to do
echo "Friendica command '$1' failed, because of no valid combination of source and version" echo "Friendica command '$1' failed, because of no version found"
return; return;
fi fi

12
develop/fpm/bin/friendica
View file

@ -54,7 +54,8 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd ${WORKDIR} cd ${WORKDIR}
php "${WORKDIR}/bin/console.php" "$@" # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
php "${WORKDIR}/bin/console.php" $@
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -70,15 +71,16 @@ copy_sources() {
installed_version="$(cat ${WORKDIR}/VERSION)" installed_version="$(cat ${WORKDIR}/VERSION)"
fi fi
if [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
fi
image_version="0.0.0.0" image_version="0.0.0.0"
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)" image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
else else
# no given installation and not using the developer branch => nothing to do # no given installation and not using the developer branch => nothing to do
echo "Friendica command '$1' failed, because of no valid combination of source and version" echo "Friendica command '$1' failed, because of no version found"
return; return;
fi fi

12
stable/apache/bin/friendica
View file

@ -54,7 +54,8 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd ${WORKDIR} cd ${WORKDIR}
php "${WORKDIR}/bin/console.php" "$@" # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
php "${WORKDIR}/bin/console.php" $@
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -70,15 +71,16 @@ copy_sources() {
installed_version="$(cat ${WORKDIR}/VERSION)" installed_version="$(cat ${WORKDIR}/VERSION)"
fi fi
if [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
fi
image_version="0.0.0.0" image_version="0.0.0.0"
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)" image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
else else
# no given installation and not using the developer branch => nothing to do # no given installation and not using the developer branch => nothing to do
echo "Friendica command '$1' failed, because of no valid combination of source and version" echo "Friendica command '$1' failed, because of no version found"
return; return;
fi fi

12
stable/fpm-alpine/bin/friendica
View file

@ -54,7 +54,8 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd ${WORKDIR} cd ${WORKDIR}
php "${WORKDIR}/bin/console.php" "$@" # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
php "${WORKDIR}/bin/console.php" $@
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -70,15 +71,16 @@ copy_sources() {
installed_version="$(cat ${WORKDIR}/VERSION)" installed_version="$(cat ${WORKDIR}/VERSION)"
fi fi
if [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
fi
image_version="0.0.0.0" image_version="0.0.0.0"
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)" image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
else else
# no given installation and not using the developer branch => nothing to do # no given installation and not using the developer branch => nothing to do
echo "Friendica command '$1' failed, because of no valid combination of source and version" echo "Friendica command '$1' failed, because of no version found"
return; return;
fi fi

12
stable/fpm/bin/friendica
View file

@ -54,7 +54,8 @@ friendica_help() {
# executes the Friendica console # executes the Friendica console
console() { console() {
cd ${WORKDIR} cd ${WORKDIR}
php "${WORKDIR}/bin/console.php" "$@" # Todo starting a php-executable without quoting the arguments seems not secure (but is the only way it works)
php "${WORKDIR}/bin/console.php" $@
} }
# executes the composer.phar binary of Friendica # executes the composer.phar binary of Friendica
@ -70,15 +71,16 @@ copy_sources() {
installed_version="$(cat ${WORKDIR}/VERSION)" installed_version="$(cat ${WORKDIR}/VERSION)"
fi fi
if [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
fi
image_version="0.0.0.0" image_version="0.0.0.0"
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)" image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
clone_develop
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
else else
# no given installation and not using the developer branch => nothing to do # no given installation and not using the developer branch => nothing to do
echo "Friendica command '$1' failed, because of no valid combination of source and version" echo "Friendica command '$1' failed, because of no version found"
return; return;
fi fi