Applied 3159e77 to develop

docker/entrypoint.sh

@@ -17,18 +17,35 @@ else
 fi
 
 # create data directories
-for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps' 'keys'; do
- mkdir -p "/var/lib/snipeit/$dir"
+for dir in \
+ 'data/private_uploads' \
+ 'data/uploads/accessories' \
+ 'data/uploads/avatars' \
+ 'data/uploads/barcodes' \
+ 'data/uploads/categories' \
+ 'data/uploads/companies' \
+ 'data/uploads/components' \
+ 'data/uploads/consumables' \
+ 'data/uploads/departments' \
+ 'data/uploads/locations' \
+ 'data/uploads/manufacturers' \
+ 'data/uploads/models' \
+ 'data/uploads/suppliers' \
+ 'dumps' \
+ 'keys'
+do
+ [ ! -d "/var/lib/snipeit/$dir" ] && mkdir -p "/var/lib/snipeit/$dir"
 done
 
 chown -R docker:root /var/lib/snipeit/data/*
 chown -R docker:root /var/lib/snipeit/dumps
 chown -R docker:root /var/lib/snipeit/keys
 
 # If the Oauth DB files are not present copy the vendor files over to the db migrations
-if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]; then
+if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]
+then
  cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
 fi
 
-. /etc/apache2/envvars 
+. /etc/apache2/envvars
 exec apache2 -DNO_DETACH < /dev/null