feat(sh):Create 2 environment variables

I create APPS and SERVER_GIT_WITH_ORGANIZATIO env var when we generate the .env file. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
build(sh): Fix shellchecl add source=/dev/null
2022-11-08 15:38:57 +01:00 · 2022-11-08 15:38:17 +01:00 · 2022-11-08 11:40:22 +01:00 · 2022-11-08 11:32:27 +01:00 · 2022-11-08 11:23:46 +01:00 · 2022-11-08 11:20:35 +01:00
4 changed files with 51 additions and 23 deletions
@@ -7,3 +7,4 @@ workspace/
 .*
 data/skeleton/
 wip/
+my-apps/
@@ -19,12 +19,27 @@ indent_cli() {
 function install_app() {
 	(
 		echo "🌏 Fetching $1"
-		(git clone https://github.com/nextcloud/"$1".git workspace/server/apps-extra/"$1" 2>&1 | indent_cli &&
+		(git clone "$SERVER_GIT_WITH_ORGANIZATION/$1".git "$PWD/my-apps/$1" 2>&1 | indent_cli &&
 			echo "✅ $1 installed") ||
 			echo "❌ Failed to install $1"
 	) | indent
 }

+function install_apps() {
+	if (( ${#APPS[@]} != 0 )); then
+		if test -z "$SERVER_GIT_WITH_ORGANIZATION"; then
+			echo "❌ You didn't define the $SERVER_GIT_WITH_ORGANIZATION variable."
+			exit 10
+		fi
+		echo "⏩ Clonning of applications in progress"
+		for app in "${APPS[@]}"; do
+			install_app "$app"
+		done
+	else
+		echo "⚠️ You don't have apps to clone."
+	fi
+}
+
 function is_installed() {
 	(
 		if [ -x "$(command -v "$1")" ]; then
@@ -67,11 +82,7 @@ mkdir -p workspace/
 #	) || echo "❌ Failed to setup worktree for stable19"
 #) | indent

-mkdir -p workspace/server/apps-extra
-install_app viewer
-install_app recommendations
-install_app files_pdfviewer
-install_app profiler
+mkdir -p ./my-apps

 echo
 echo
@@ -81,14 +92,21 @@ cat <<EOT >.env
 COMPOSE_PROJECT_NAME=master
 DOMAIN_SUFFIX=.local
 REPO_PATH_SERVER=$PWD/workspace/server
-ADDITIONAL_APPS_PATH=$PWD/workspace/server/apps-extra
+ADDITIONAL_APPS_PATH=$PWD/my-apps
 STABLE_ROOT_PATH=$PWD/workspace
 NEXTCLOUD_AUTOINSTALL_APPS="viewer profiler"
 DOCKER_SUBNET=192.168.21.0/24
 PORTBASE=821
+APPS=()
+SERVER_GIT_WITH_ORGANIZATION=""
 EOT
 fi

+# shellcheck source=/dev/null
+source .env
+
+install_apps
+
 if [[ $(uname -m) == 'arm64' ]]; then
 	echo "Setting custom containers for arm platform"

@@ -71,7 +71,7 @@ services:
      BLACKFIRE_CLIENT_TOKEN:
    volumes:
      - '${REPO_PATH_SERVER}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - data:/var/www/html/data
      - config:/var/www/html/config
      - /var/www/html/apps-writable
@@ -94,7 +94,7 @@ services:
      VIRTUAL_HOST: "nextcloud2${DOMAIN_SUFFIX}"
    volumes:
      - '${REPO_PATH_SERVER}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    ports:
@@ -113,7 +113,7 @@ services:
      VIRTUAL_HOST: "nextcloud3${DOMAIN_SUFFIX}"
    volumes:
      - '${REPO_PATH_SERVER}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./docker/configs/config.php:/var/www/html/config/writable.config.php:ro
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
@@ -136,7 +136,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable16:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable16/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -164,7 +164,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable17:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable17/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -192,7 +192,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable18:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable18/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -220,7 +220,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable19:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable19/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -248,7 +248,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable20:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable20/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -276,7 +276,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable21:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable21/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -304,7 +304,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable22:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable22/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -332,7 +332,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable23:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable23/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -360,7 +360,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable24:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable24/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -388,7 +388,7 @@ services:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
      - '${STABLE_ROOT_PATH}/stable25:/var/www/html'
-      - '${STABLE_ROOT_PATH}/stable25/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - /var/www/html/apps-writable
@@ -626,7 +626,7 @@ services:
      GS_MODE: master
    volumes:
      - '${STABLE_ROOT_PATH}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -648,7 +648,7 @@ services:
      GS_MODE: slave
    volumes:
      - '${STABLE_ROOT_PATH}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -671,7 +671,7 @@ services:
      GS_MODE: slave
    volumes:
      - '${STABLE_ROOT_PATH}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -36,3 +36,12 @@ DOMAIN_SUFFIX=.local
 # May be used to choose database. Both SQL and DB_SERVICE have to be set if used. Defaults to mysql.
 # SQL=pgsql
 # DB_SERVICE=database-postgres
+
+
+# Your server git with your organization or user.
+# Example : https://github.com/nextcloud
+# SERVER_GIT_WITH_ORGANIZATION=""
+
+# You define your apps list to clone.
+# Example: APPS=(viewer recommendations files_pdfviewer profiler)
+# APPS=()
Author	SHA1	Message	Date
Baptiste Fotia	60f5cefc19	feat(sh):Create 2 environment variables I create APPS and SERVER_GIT_WITH_ORGANIZATIO env var when we generate the .env file. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 15:38:57 +01:00
Baptiste Fotia	aac7883609	build(sh): Fix shellchecl add source=/dev/null Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 15:38:17 +01:00
Baptiste Fotia	71ff3f9ac0	fix(bash): Declare the source file for shellcheck Please, read the doc : https://www.shellcheck.net/wiki/SC1091 Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:40:22 +01:00
Baptiste Fotia	440daf474c	fix(bash): Shellcheck compliant I had an error with ShellCheck in the CI. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:32:27 +01:00
Baptiste Fotia	7c56999606	chore(): Add the my-apps folder in the gitignore Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:23:46 +01:00
Baptiste Fotia	cc1d2021c3	feat(yaml,sh,env): Centralise the apps folder This feature centralise the apps folder for the end user (dev). We don't need to clone our apps for each nextcloud releases. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:20:35 +01:00