Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "The current directory is not empty" message appearing on new install #1140

Merged
merged 3 commits into from
Apr 25, 2024
Merged

Fix "The current directory is not empty" message appearing on new install #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
079c79e
Release 47.0.0 (#1138)
markshust Apr 25, 2024
4643645
Fix "The current directory is not empty" message appearing on new ins…
markshust Apr 25, 2024
5cb47bb
Merge branch 'release/next' into feature/dir-not-empty-issue
markshust Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions compose/bin/download
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion compose/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions lib/onelinesetup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down