Skip to content

Commit

Permalink
Merge branch 'release/next' into feature/dir-not-empty-issue
Browse files Browse the repository at this point in the history
  • Loading branch information
markshust authored Apr 25, 2024
2 parents 4643645 + 4d0801d commit 5cb47bb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion compose/bin/download
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ NC='\033[0m' # No Color
bin/stop

if [ -d "./src" ]; then
echo "Error: The "src" directory is not empty. Please remove all contents within this directory and try again."
echo "Error: The \"src\" directory is not empty. Please remove all contents within this directory and try again."
exit 1
fi

Expand Down
5 changes: 5 additions & 0 deletions lib/template
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ git remote add origin https://github.com/markshust/docker-magento
git fetch origin -qqq
git checkout origin/master -- compose

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

mv compose/* ./
mv compose/.gitignore ./
mv compose/.vscode ./
Expand Down

0 comments on commit 5cb47bb

Please sign in to comment.