From 20d59aae267d26d431f6e47e7bc2d8ab47bb6858 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Thu, 27 Jun 2019 18:52:40 +0200 Subject: [PATCH] Using full repository url --- .docker-files/entrypoint.sh | 8 ++++---- 2019.06/apache/entrypoint.sh | 8 ++++---- 2019.06/fpm-alpine/entrypoint.sh | 8 ++++---- 2019.06/fpm/entrypoint.sh | 8 ++++---- 2019.09-dev/apache/entrypoint.sh | 8 ++++---- 2019.09-dev/fpm-alpine/entrypoint.sh | 8 ++++---- 2019.09-dev/fpm/entrypoint.sh | 8 ++++---- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.docker-files/entrypoint.sh b/.docker-files/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/.docker-files/entrypoint.sh +++ b/.docker-files/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished" diff --git a/2019.06/apache/entrypoint.sh b/2019.06/apache/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/2019.06/apache/entrypoint.sh +++ b/2019.06/apache/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished" diff --git a/2019.06/fpm-alpine/entrypoint.sh b/2019.06/fpm-alpine/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/2019.06/fpm-alpine/entrypoint.sh +++ b/2019.06/fpm-alpine/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished" diff --git a/2019.06/fpm/entrypoint.sh b/2019.06/fpm/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/2019.06/fpm/entrypoint.sh +++ b/2019.06/fpm/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished" diff --git a/2019.09-dev/apache/entrypoint.sh b/2019.09-dev/apache/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/2019.09-dev/apache/entrypoint.sh +++ b/2019.09-dev/apache/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished" diff --git a/2019.09-dev/fpm-alpine/entrypoint.sh b/2019.09-dev/fpm-alpine/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/2019.09-dev/fpm-alpine/entrypoint.sh +++ b/2019.09-dev/fpm-alpine/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished" diff --git a/2019.09-dev/fpm/entrypoint.sh b/2019.09-dev/fpm/entrypoint.sh index 7f5d327..abd2b83 100644 --- a/2019.09-dev/fpm/entrypoint.sh +++ b/2019.09-dev/fpm/entrypoint.sh @@ -19,8 +19,8 @@ version_greater() { clone_develop() { friendica_git="${FRIENDICA_VERSION}" addons_git="${FRIENDICA_ADDONS}" - friendica_repo="${FRIENDICA_REPOSITORY:-friendica}" - friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica}" + friendica_repo="${FRIENDICA_REPOSITORY:-friendica/friendica}" + friendica_addons_repo="${FRIENDICA_ADDONS_REPO:-friendica/friendica-addons}" if echo "{$friendica_git,,}" | grep -Eq '^.*\-dev'; then friendica_git="develop" @@ -34,10 +34,10 @@ clone_develop() { # Removing the whole directory first rm -fr /usr/src/friendica - sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo}/friendica /usr/src/friendica" + sh -c "git clone -q -b ${friendica_git} https://github.com/${friendica_repo} /usr/src/friendica" mkdir /usr/src/friendica/addon - sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo}/friendica-addons /usr/src/friendica/addon" + sh -c "git clone -q -b ${addons_git} https://github.com/${friendica_addons_repo} /usr/src/friendica/addon" echo "Download finished"