From 31ed0317596fc1363a98aac38c0a085d29ff3cc5 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Sat, 26 Jun 2021 15:28:08 +0200
Subject: [PATCH 1/2] merge master

---
 data/scripts/get_coco.sh | 8 ++++----
 utils/aws/userdata.sh    | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/data/scripts/get_coco.sh b/data/scripts/get_coco.sh
index caae37504780..15d0dc74b76a 100755
--- a/data/scripts/get_coco.sh
+++ b/data/scripts/get_coco.sh
@@ -8,20 +8,20 @@
 #     /yolov5
 
 # Download/unzip labels
-d='../' # unzip directory
+d='../datasets' # unzip directory
 url=https://github.com/ultralytics/yolov5/releases/download/v1.0/
 f='coco2017labels.zip' # or 'coco2017labels-segments.zip', 68 MB
 echo 'Downloading' $url$f ' ...'
-curl -L $url$f -o $f && unzip -q $f -d $d && rm $f & # download, unzip, remove in background
+curl -L $url$f -o $f && unzip -q $f -d $d && rm $f &# download, unzip, remove in background
 
 # Download/unzip images
-d='../coco/images' # unzip directory
+d='../datasets/coco/images' # unzip directory
 url=http://images.cocodataset.org/zips/
 f1='train2017.zip' # 19G, 118k images
 f2='val2017.zip'   # 1G, 5k images
 f3='test2017.zip'  # 7G, 41k images (optional)
 for f in $f1 $f2; do
   echo 'Downloading' $url$f '...'
-  curl -L $url$f -o $f && unzip -q $f -d $d && rm $f & # download, unzip, remove in background
+  curl -L $url$f -o $f && unzip -q $f -d $d && rm $f &# download, unzip, remove in background
 done
 wait # finish background tasks
diff --git a/utils/aws/userdata.sh b/utils/aws/userdata.sh
index 52c0fe33d90f..5fc1332ac1b0 100644
--- a/utils/aws/userdata.sh
+++ b/utils/aws/userdata.sh
@@ -10,7 +10,6 @@ if [ ! -d yolov5 ]; then
   git clone https://github.com/ultralytics/yolov5 -b master && sudo chmod -R 777 yolov5
   cd yolov5
   bash data/scripts/get_coco.sh && echo "COCO done." &
-  bash data/scripts/get_voc.sh && echo "VOC done." &
   sudo docker pull ultralytics/yolov5:latest && echo "Docker done." &
   python -m pip install --upgrade pip && pip install -r requirements.txt && python detect.py && echo "Requirements done." &
   wait && echo "All tasks done." # finish background tasks

From 72b6e75ce048ac3ac855f50b89a42a4be312eba3 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Sat, 26 Jun 2021 15:29:00 +0200
Subject: [PATCH 2/2] Update get_coco.sh

---
 data/scripts/get_coco.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/scripts/get_coco.sh b/data/scripts/get_coco.sh
index 15d0dc74b76a..bce692c29ae2 100755
--- a/data/scripts/get_coco.sh
+++ b/data/scripts/get_coco.sh
@@ -12,7 +12,7 @@ d='../datasets' # unzip directory
 url=https://github.com/ultralytics/yolov5/releases/download/v1.0/
 f='coco2017labels.zip' # or 'coco2017labels-segments.zip', 68 MB
 echo 'Downloading' $url$f ' ...'
-curl -L $url$f -o $f && unzip -q $f -d $d && rm $f &# download, unzip, remove in background
+curl -L $url$f -o $f && unzip -q $f -d $d && rm $f & # download, unzip, remove in background
 
 # Download/unzip images
 d='../datasets/coco/images' # unzip directory
@@ -22,6 +22,6 @@ f2='val2017.zip'   # 1G, 5k images
 f3='test2017.zip'  # 7G, 41k images (optional)
 for f in $f1 $f2; do
   echo 'Downloading' $url$f '...'
-  curl -L $url$f -o $f && unzip -q $f -d $d && rm $f &# download, unzip, remove in background
+  curl -L $url$f -o $f && unzip -q $f -d $d && rm $f & # download, unzip, remove in background
 done
 wait # finish background tasks