From 3f18635f67e677074975d53dc2bb6dfb6ec9af9f Mon Sep 17 00:00:00 2001 From: mukan-bot Date: Thu, 16 Oct 2025 20:32:12 +0900 Subject: [PATCH] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=83=84=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=AE=E7=A2=BA=E8=AA=8D=E5=87=A6=E7=90=86=E3=82=92?= =?UTF-8?q?=E6=94=B9=E5=96=84=E3=81=97=E3=80=81=E3=82=A8=E3=83=A9=E3=83=BC?= =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E7=B5=B1?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/start.sh b/start.sh index b2b3079..c0e4d1c 100644 --- a/start.sh +++ b/start.sh @@ -59,18 +59,18 @@ show_help() { # 必要なツールの確認 check_requirements() { - local missing_tools="" + local missing_tools=() - if ! command -v docker > /dev/null 2>&1; then - missing_tools="docker " + if ! command -v docker &> /dev/null; then + missing_tools+=("docker") fi - if ! command -v docker-compose > /dev/null 2>&1 && ! docker compose version > /dev/null 2>&1; then - missing_tools="${missing_tools}docker-compose " + if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then + missing_tools+=("docker-compose") fi - if [ -n "$missing_tools" ]; then - log_error "以下のツールがインストールされていません: $missing_tools" + if [ ${#missing_tools[@]} -ne 0 ]; then + log_error "以下のツールがインストールされていません: ${missing_tools[*]}" log_info "Dockerのインストール: https://docs.docker.com/get-docker/" exit 1 fi @@ -216,7 +216,7 @@ cleanup() { compose_up() { log_info "docker-compose でサービスを起動しています..." - if command -v docker-compose > /dev/null 2>&1; then + if command -v docker-compose &> /dev/null; then docker-compose up -d else docker compose up -d @@ -230,7 +230,7 @@ compose_up() { compose_down() { log_info "docker-compose でサービスを停止しています..." - if command -v docker-compose > /dev/null 2>&1; then + if command -v docker-compose &> /dev/null; then docker-compose down else docker compose down @@ -244,13 +244,13 @@ run_python() { log_info "Python環境で直接実行します..." # Python3の確認 - if ! command -v python3 > /dev/null 2>&1; then + if ! command -v python3 &> /dev/null; then log_error "Python3がインストールされていません" exit 1 fi # pipの確認 - if ! command -v pip3 > /dev/null 2>&1; then + if ! command -v pip3 &> /dev/null; then log_error "pip3がインストールされていません" exit 1 fi @@ -313,7 +313,7 @@ main() { compose_down ;; "compose-logs") - if command -v docker-compose > /dev/null 2>&1; then + if command -v docker-compose &> /dev/null; then docker-compose logs -f else docker compose logs -f