From 9a270e02f69ff3916609b494e2b5aec131343495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Mon, 23 Sep 2024 09:56:29 +0200 Subject: [PATCH] feat: merge nc scripts into ncm.sh --- scripts/manage.sh | 134 -------------------------------------- scripts/nc-add-indices.sh | 5 -- scripts/nc-htaccess.sh | 5 -- scripts/nc-upgrade.sh | 5 -- scripts/ncm.sh | 35 ++++++++++ 5 files changed, 35 insertions(+), 149 deletions(-) delete mode 100755 scripts/manage.sh delete mode 100755 scripts/nc-add-indices.sh delete mode 100755 scripts/nc-htaccess.sh delete mode 100755 scripts/nc-upgrade.sh create mode 100755 scripts/ncm.sh diff --git a/scripts/manage.sh b/scripts/manage.sh deleted file mode 100755 index 49842db..0000000 --- a/scripts/manage.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -print_usage() { - echo "Usage:" - echo " $0 [-d|--daemon]" - echo " $0 sh [--shell ]" - echo " $0 logs [] [-f|--follow]" - exit 1 -} - -# Check if correct number of arguments is provided -if [ $# -lt 2 ]; then - print_usage -fi - -action=$1 -service=$2 -daemon_flag="" -shell="sh" -follow_flag="" - -case "$action" in - up|down) - if [ $# -gt 3 ]; then - print_usage - fi - if [ $# -eq 3 ]; then - if [ "$3" = "-d" ] || [ "$3" = "--daemon" ]; then - daemon_flag="-d" - else - echo "Invalid flag. Use '-d' or '--daemon' for detached mode." - exit 1 - fi - fi - ;; - sh) - if [ $# -lt 3 ]; then - print_usage - fi - subservice=$3 - shift 3 - while [ $# -gt 0 ]; do - case "$1" in - --shell) - if [ -z "$2" ]; then - echo "Shell name is missing after --shell flag." - exit 1 - fi - shell="$2" - shift 2 - ;; - *) - echo "Unknown option: $1" - print_usage - ;; - esac - done - ;; - logs) - subservice="" - shift 2 - while [ $# -gt 0 ]; do - case "$1" in - -f|--follow) - follow_flag="--follow" - shift - ;; - *) - if [ -z "$subservice" ]; then - subservice="$1" - else - echo "Unknown option: $1" - print_usage - fi - shift - ;; - esac - done - ;; - *) - echo "Invalid action. Use 'up', 'down', 'sh', or 'logs'." - exit 1 - ;; -esac - -execute_docker_compose() { - dir=$1 - cmd=$2 - echo "Executing in $dir: docker compose $cmd $daemon_flag" - cd "$dir" && docker compose "$cmd" $daemon_flag - cd - > /dev/null || exit -} - -execute_docker_shell() { - dir=$1 - subservice=$2 - echo "Executing in $dir: docker compose exec $subservice $shell" - cd "$dir" && docker compose exec "$subservice" "$shell" - cd - > /dev/null || exit -} - -execute_docker_logs() { - dir=$1 - subservice=$2 - echo "Executing in $dir: docker compose logs $follow_flag $subservice" - cd "$dir" && docker compose logs $follow_flag "$subservice" - cd - > /dev/null || exit -} - -if [ "$action" = "sh" ]; then - if [ ! -d "$service" ]; then - echo "Service directory '$service' not found." - exit 1 - fi - execute_docker_shell "$service" "$subservice" -elif [ "$action" = "logs" ]; then - if [ ! -d "$service" ]; then - echo "Service directory '$service' not found." - exit 1 - fi - execute_docker_logs "$service" "$subservice" -elif [ "$service" = "all" ]; then - for dir in */; do - if [ -f "${dir}docker-compose.yml" ] || [ -f "${dir}docker-compose.yaml" ]; then - execute_docker_compose "$dir" "$action" - fi - done -else - if [ ! -d "$service" ]; then - echo "Service directory '$service' not found." - exit 1 - fi - execute_docker_compose "$service" "$action" -fi diff --git a/scripts/nc-add-indices.sh b/scripts/nc-add-indices.sh deleted file mode 100755 index 37fb748..0000000 --- a/scripts/nc-add-indices.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -script_dir=$(dirname "$(readlink -f "$0")") -cd "$script_dir/../docker/nextcloud" || exit 1 -docker compose exec nextcloud sudo -u www-data php occ db:add-missing-indices diff --git a/scripts/nc-htaccess.sh b/scripts/nc-htaccess.sh deleted file mode 100755 index 831fa1e..0000000 --- a/scripts/nc-htaccess.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -script_dir=$(dirname "$(readlink -f "$0")") -cd "$script_dir/../docker/nextcloud" || exit 1 -docker compose exec nextcloud sudo -u www-data php occ maintenance:update:htaccess diff --git a/scripts/nc-upgrade.sh b/scripts/nc-upgrade.sh deleted file mode 100755 index eec9b55..0000000 --- a/scripts/nc-upgrade.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh - -script_dir=$(dirname "$(readlink -f "$0")") -cd "$script_dir/../docker/nextcloud" || exit 1 -docker compose exec nextcloud sudo -u www-data php occ upgrade diff --git a/scripts/ncm.sh b/scripts/ncm.sh new file mode 100755 index 0000000..4e7a165 --- /dev/null +++ b/scripts/ncm.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash + +SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" + +cd "$SCRIPT_DIR/../docker/nextcloud" || exit + +docker_exec() { + docker compose exec nextcloud "$@" +} + +occ_exec() { + docker_exec sudo -E -u www-data php occ "$@" +} + +case "$1" in + upgrade) + occ_exec upgrade + ;; + htaccess) + occ_exec maintenance:update:htaccess + ;; + indices) + occ_exec db:add-missing-indices + ;; + occ) + occ_exec "$@" + ;; + exec) + docker_exec "$@" + ;; + *) + echo "Usage: $0 {upgrade|htaccess|indices|occ |exec }" + exit 1 + ;; +esac