More elegant solution to #249

compose/bin/magento

@@ -1,2 +1,16 @@
 #!/bin/bash
-bin/cli bin/magento "$@"
+if [ "$1" == "sampledata:deploy" ]; then
+  echo "Disabling Temando_Shipping module to fix conflict with deploying sample data."
+  bin/cli bin/magento module:disable Temando_Shipping
+  
+  bin/cli bin/magento sampledata:deploy
+  
+  echo "Automatically running setup:upgrade for you to populate sample data!"
+  bin/cli bin/magento setup:upgrade
+  
+  echo "Re-enabling Temando_Shipping module and flushing cache since sample data is now deployed."
+  bin/cli bin/magento module:enable Temando_Shipping
+  bin/cli bin/magento cache:flush
+else
+  bin/cli bin/magento "$@"
+fi

compose/bin/setup

@@ -97,9 +97,5 @@ bin/copyfromcontainer vendor
 echo "Generating SSL certificate..."
 bin/setup-ssl $BASE_URL
 
-echo "Disabling Temando_Shipping module to fix conflict with deploying sample data. Re-enable at your own risk."
-bin/clinotty bin/magento module:disable Temando_Shipping
-bin/clinotty bin/magento cache:flush
-
 echo "Docker development environment setup complete."
 echo "You may now access your Magento instance at https://${BASE_URL}/"