mirror of
https://github.com/friendica/docker
synced 2025-02-03 13:52:28 +01:00
friendica cli improvement
`friendica update` now pulls the latest git changes of the develop-branch
This commit is contained in:
parent
2125efd5f6
commit
7e2bfa10c4
6 changed files with 42 additions and 30 deletions
|
|
@ -54,7 +54,8 @@ friendica_help() {
|
|||
# executes the Friendica console
|
||||
console() {
|
||||
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
|
||||
|
|
@ -70,15 +71,16 @@ copy_sources() {
|
|||
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||
fi
|
||||
|
||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
fi
|
||||
|
||||
image_version="0.0.0.0"
|
||||
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
else
|
||||
# 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;
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ friendica_help() {
|
|||
# executes the Friendica console
|
||||
console() {
|
||||
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
|
||||
|
|
@ -70,15 +71,16 @@ copy_sources() {
|
|||
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||
fi
|
||||
|
||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
fi
|
||||
|
||||
image_version="0.0.0.0"
|
||||
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
else
|
||||
# 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;
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ friendica_help() {
|
|||
# executes the Friendica console
|
||||
console() {
|
||||
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
|
||||
|
|
@ -70,15 +71,16 @@ copy_sources() {
|
|||
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||
fi
|
||||
|
||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
fi
|
||||
|
||||
image_version="0.0.0.0"
|
||||
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
else
|
||||
# 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;
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ friendica_help() {
|
|||
# executes the Friendica console
|
||||
console() {
|
||||
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
|
||||
|
|
@ -70,15 +71,16 @@ copy_sources() {
|
|||
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||
fi
|
||||
|
||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
fi
|
||||
|
||||
image_version="0.0.0.0"
|
||||
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
else
|
||||
# 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;
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ friendica_help() {
|
|||
# executes the Friendica console
|
||||
console() {
|
||||
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
|
||||
|
|
@ -70,15 +71,16 @@ copy_sources() {
|
|||
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||
fi
|
||||
|
||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
fi
|
||||
|
||||
image_version="0.0.0.0"
|
||||
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
else
|
||||
# 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;
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ friendica_help() {
|
|||
# executes the Friendica console
|
||||
console() {
|
||||
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
|
||||
|
|
@ -70,15 +71,16 @@ copy_sources() {
|
|||
installed_version="$(cat ${WORKDIR}/VERSION)"
|
||||
fi
|
||||
|
||||
if [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
fi
|
||||
|
||||
image_version="0.0.0.0"
|
||||
if [ -f ${SOURCEDIR}/friendica/VERSION ]; then
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
elif [ "$FRIENDICA_VERSION" = "develop" ]; then
|
||||
clone_develop
|
||||
image_version="$(cat ${SOURCEDIR}/friendica/VERSION)"
|
||||
else
|
||||
# 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;
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue