From 7de00f8385d7517a9c47a2b10117b8ae90338395 Mon Sep 17 00:00:00 2001
From: toxa <prokopenkoanton17@dimti.ru>
Date: Sun, 29 Jan 2023 12:26:48 +0300
Subject: [PATCH] * windows adjust docker cmd for update composer script

---
 bash/composer-set-to-1.sh | 18 ------------------
 bash/composer-set-to-2.sh | 18 ------------------
 bash/update-composer.sh   |  6 +++++-
 3 files changed, 5 insertions(+), 37 deletions(-)
 delete mode 100644 bash/composer-set-to-1.sh
 delete mode 100644 bash/composer-set-to-2.sh

diff --git a/bash/composer-set-to-1.sh b/bash/composer-set-to-1.sh
deleted file mode 100644
index ca63b7f..0000000
--- a/bash/composer-set-to-1.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-. ./_docker-cmd.sh || {
-  echo "no docker cmd is presented" && exit 1
-}
-
-PHP_VERSION=$1 # Without dot
-
-if [[ -z "${PHP_VERSION}" ]]; then PHP_VERSION=74; fi
-
-CONTAINER=$(docker ps | grep workspace${PHP_VERSION} | awk '{print $1}')
-
-
-if [[ -z "${CONTAINER}" ]]; then
-  echo "Unable to find container: workspace${PHP_VERSION}"
-  exit 1
-fi
-
-$DOCKER_CMD exec -ti ${CONTAINER} composer self-update --1
diff --git a/bash/composer-set-to-2.sh b/bash/composer-set-to-2.sh
deleted file mode 100644
index 18cb9dd..0000000
--- a/bash/composer-set-to-2.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-. ./_docker-cmd.sh || {
-  echo "no docker cmd is presented" && exit 1
-}
-
-PHP_VERSION=$1 # Without dot
-
-if [[ -z "${PHP_VERSION}" ]]; then PHP_VERSION=74; fi
-
-CONTAINER=$(docker ps | grep workspace${PHP_VERSION} | awk '{print $1}')
-
-
-if [[ -z "${CONTAINER}" ]]; then
-  echo "Unable to find container: workspace${PHP_VERSION}"
-  exit 1
-fi
-
-$DOCKER_CMD exec -ti ${CONTAINER} composer self-update --2
diff --git a/bash/update-composer.sh b/bash/update-composer.sh
index 4ecffaf..0938210 100755
--- a/bash/update-composer.sh
+++ b/bash/update-composer.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+. ./_docker-cmd.sh || {
+  echo "no docker cmd is presented" && exit 1
+}
+
 PHP_VERSION=$1 # Without dot
 COMPOSER_VERSION=$2
 
@@ -15,4 +19,4 @@ if [[ -z "${COMPOSER_VERSION}" ]]; then
   COMPOSER_VERSION=1
 fi
 
-docker exec -ti "${CONTAINER}" composer self-update --${COMPOSER_VERSION}
+$DOCKER_CMD exec -ti "${CONTAINER}" composer self-update --${COMPOSER_VERSION}