From 3aebb1ac08eca24899613bb5a8a32f0ef2691dd2 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 20 May 2018 16:54:57 +0200 Subject: [PATCH] Replaced every "exit" in the `friendica` CLI with "return" This should possibly fix the Travis.yml test --- develop/apache/bin/friendica | 4 ++-- develop/fpm-alpine/bin/friendica | 4 ++-- develop/fpm/bin/friendica | 4 ++-- stable/apache/bin/friendica | 4 ++-- stable/fpm-alpine/bin/friendica | 4 ++-- stable/fpm/bin/friendica | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/develop/apache/bin/friendica b/develop/apache/bin/friendica index 8bad6ad..66233c1 100644 --- a/develop/apache/bin/friendica +++ b/develop/apache/bin/friendica @@ -48,7 +48,7 @@ friendica_help() { echo " composer Executes the composer.phar executable for Friendica" echo " install Installs Friendica" echo " update Updates Friendica" - exit 1 + return } # executes the Friendica console @@ -86,7 +86,7 @@ copy_sources() { if version_greater "$installed_version" "$image_version"; then echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)" - exit 1; + return; fi if version_greater "$image_version" "$installed_version"; then diff --git a/develop/fpm-alpine/bin/friendica b/develop/fpm-alpine/bin/friendica index 8bad6ad..66233c1 100644 --- a/develop/fpm-alpine/bin/friendica +++ b/develop/fpm-alpine/bin/friendica @@ -48,7 +48,7 @@ friendica_help() { echo " composer Executes the composer.phar executable for Friendica" echo " install Installs Friendica" echo " update Updates Friendica" - exit 1 + return } # executes the Friendica console @@ -86,7 +86,7 @@ copy_sources() { if version_greater "$installed_version" "$image_version"; then echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)" - exit 1; + return; fi if version_greater "$image_version" "$installed_version"; then diff --git a/develop/fpm/bin/friendica b/develop/fpm/bin/friendica index 8bad6ad..66233c1 100644 --- a/develop/fpm/bin/friendica +++ b/develop/fpm/bin/friendica @@ -48,7 +48,7 @@ friendica_help() { echo " composer Executes the composer.phar executable for Friendica" echo " install Installs Friendica" echo " update Updates Friendica" - exit 1 + return } # executes the Friendica console @@ -86,7 +86,7 @@ copy_sources() { if version_greater "$installed_version" "$image_version"; then echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)" - exit 1; + return; fi if version_greater "$image_version" "$installed_version"; then diff --git a/stable/apache/bin/friendica b/stable/apache/bin/friendica index 8bad6ad..66233c1 100644 --- a/stable/apache/bin/friendica +++ b/stable/apache/bin/friendica @@ -48,7 +48,7 @@ friendica_help() { echo " composer Executes the composer.phar executable for Friendica" echo " install Installs Friendica" echo " update Updates Friendica" - exit 1 + return } # executes the Friendica console @@ -86,7 +86,7 @@ copy_sources() { if version_greater "$installed_version" "$image_version"; then echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)" - exit 1; + return; fi if version_greater "$image_version" "$installed_version"; then diff --git a/stable/fpm-alpine/bin/friendica b/stable/fpm-alpine/bin/friendica index 8bad6ad..66233c1 100644 --- a/stable/fpm-alpine/bin/friendica +++ b/stable/fpm-alpine/bin/friendica @@ -48,7 +48,7 @@ friendica_help() { echo " composer Executes the composer.phar executable for Friendica" echo " install Installs Friendica" echo " update Updates Friendica" - exit 1 + return } # executes the Friendica console @@ -86,7 +86,7 @@ copy_sources() { if version_greater "$installed_version" "$image_version"; then echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)" - exit 1; + return; fi if version_greater "$image_version" "$installed_version"; then diff --git a/stable/fpm/bin/friendica b/stable/fpm/bin/friendica index 8bad6ad..66233c1 100644 --- a/stable/fpm/bin/friendica +++ b/stable/fpm/bin/friendica @@ -48,7 +48,7 @@ friendica_help() { echo " composer Executes the composer.phar executable for Friendica" echo " install Installs Friendica" echo " update Updates Friendica" - exit 1 + return } # executes the Friendica console @@ -86,7 +86,7 @@ copy_sources() { if version_greater "$installed_version" "$image_version"; then echo "Can't copy Friendica sources because the version of the data ($installed_version) is higher than the docker image ($image_version)" - exit 1; + return; fi if version_greater "$image_version" "$installed_version"; then