From b6b46f56c5048e8435179d01136167c6b4f6d6bb Mon Sep 17 00:00:00 2001 From: Mark Shust Date: Thu, 25 Apr 2024 12:35:35 -0400 Subject: [PATCH] Fix "The current directory is not empty" message appearing on new install (#1140) Co-authored-by: Michael Lehmkuhl Co-authored-by: Jenyamba Co-authored-by: Tu Van Co-authored-by: Cid Lopes --- CHANGELOG.md | 5 +++++ compose/bin/download | 4 ++-- compose/compose.yaml | 2 +- lib/onelinesetup | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 659c9eae2..b0e177dc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [47.0.1] - 2024-04-25 + +### Fixed +- "The current directory is not empty" message appearing on new install [PR #1141](https://github.com/markshust/docker-magento/pull/1141). + ## [47.0.0] - 2024-04-25 ### Added diff --git a/compose/bin/download b/compose/bin/download index 9ae09b959..a540eee90 100755 --- a/compose/bin/download +++ b/compose/bin/download @@ -10,8 +10,8 @@ NC='\033[0m' # No Color bin/stop -if [ -d "./bin" ]; then - echo "Error: The current directory is not empty. Please remove all contents within this directory and try again." +if [ -d "./src" ]; then + echo "Error: The \"src\" directory is not empty. Please remove all contents within this directory and try again." exit 1 fi diff --git a/compose/compose.yaml b/compose/compose.yaml index c0e987cb0..82bcf4e54 100644 --- a/compose/compose.yaml +++ b/compose/compose.yaml @@ -1,7 +1,7 @@ ## Mark Shust's Docker Configuration for Magento ## (https://github.com/markshust/docker-magento) ## -## Version 47.0.0 +## Version 47.0.1 ## To use SSH, see https://github.com/markshust/docker-magento#ssh ## Linux users, see https://github.com/markshust/docker-magento#linux diff --git a/lib/onelinesetup b/lib/onelinesetup index 62b5fbdaa..b1234baf7 100755 --- a/lib/onelinesetup +++ b/lib/onelinesetup @@ -5,6 +5,11 @@ DOMAIN=${1:-magento.test} VERSION=${2:-2.4.7} EDITION=${3:-community} +if [ -d "./bin" ]; then + echo "Error: The current directory is not empty. Please remove all contents within this directory and try again." + exit 1 +fi + curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash # &&'s are used below otherwise onelinesetup script fails/errors after bin/download