Fix install (conflit entre les fixtures et la création du superuser)

haribo
1 parent 6cffa40e
Showing 1 changed file with 10 additions and 3 deletions Show diff stats
install/install_requirements.sh
@@ -45,6 +45,9 @@ MAKE_MIGRATIONS=&quot;-Make migrations for DB models&quot;
 LOAD_FIXTURES="-Loading fixtures ..."
 FINAL_MESSAGE="-Please run './pyrosrun server' then go to localhost:$PORT/admin and log in with these id"
  
+# Deactivate the venv in case it is activated
+deactivate 2> /dev/null
+
 # Getting python location
 PYTHON_DIR=`which $PYTHON`
 if [ $? -ne 0 ]; then
@@ -143,13 +146,17 @@ if [ $? -ne 0 ]; then
     exit
 fi
  
+
+# There is no need to create the superuser, because it is in the fixtures
+# echo $CREATE_SUPERUSER
+# echo $CREATE_SUPERUSER_SCRIPT | python ../src/manage.py shell
+
 echo $LOAD_FIXTURES
 python manage.py loaddata fixtures/initial_fixture.json 
  
-echo $CREATE_SUPERUSER
-echo $CREATE_SUPERUSER_SCRIPT | python ../src/manage.py shell
-
 echo $TELL_SUPERUSER_CREATION
+
+
 read -n1 -r -p "Press any key to continue..." key
 echo $FINAL_MESSAGE
 read -n1 -r -p "Press any key to continue..." key