Fix docker startup

.gitattributes

@@ -0,0 +1,2 @@
+* text=auto
+*.sh text eol=lf

src/Software/docker/django/start

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
-
-python manage.py collectstatic --noinput
-gunicorn teamverwaltung.wsgi -c /var/gunicorn/gunicorn.py
+#!/usr/bin/env bash
+
+python manage.py collectstatic --noinput
+gunicorn teamverwaltung.wsgi -c /var/gunicorn/gunicorn.py

src/Software/docker/django/wait

@@ -1,6 +1,6 @@
-#!/usr/bin/env bash
-
-while ! mysqladmin ping -h"db" -P"3306" --silent; do
-    echo "Waiting for MySQL to be up..."
-    sleep 1
-done
+#!/usr/bin/env bash
+
+while ! mysqladmin ping -h"db" -P"3306" --silent; do
+    echo "Waiting for MySQL to be up..."
+    sleep 1
+done

src/Software/fix_permissions.sh

@@ -1,14 +1,14 @@
-#!/bin/bash
-
-# cd & check
-if ! cd "$(dirname "$0")"; then exit; fi
-
-# fix permissions
-find docker -type d -exec chmod 0775 {} \;
-find docker -type f -exec chmod 0664 {} \;
-
-find src -type d -exec chmod 0775 {} \;
-find src -type f -exec chmod 0664 {} \;
-
-chmod 775 docker/django/start
-chmod 775 docker/django/wait
+#!/bin/bash
+
+# cd & check
+if ! cd "$(dirname "$0")"; then exit; fi
+
+# fix permissions
+find docker -type d -exec chmod 0775 {} \;
+find docker -type f -exec chmod 0664 {} \;
+
+find src -type d -exec chmod 0775 {} \;
+find src -type f -exec chmod 0664 {} \;
+
+chmod 775 docker/django/start
+chmod 775 docker/django/wait

src/Software/src/teamverwaltung/teamverwaltung_main/parse.py

@@ -156,7 +156,7 @@ def parse_snum(self, email: str):
         return email[:6]
 
     def parse_title(self, title: str):
-        """Parst die Anrede aus den ersten 6 Zeichen der Email
+        """Parst die Anrede des Studenten
 
         :param title: Anrede des Studenten
         :type title: str
@@ -170,7 +170,7 @@ def parse_title(self, title: str):
         if title == "Herr":
             return "h"
         elif title == "Frau":
-            return = "f"
+            return "f"
         else:
             raise CSVStudentParserException("unknown title")
 

src/Software/start.sh

@@ -1,15 +1,15 @@
-#!/bin/bash
-
-# cd & check
-if ! cd "$(dirname "$0")"; then exit; fi
-
-if [ "$1" = "--reset" -o "$1" = "-b" ]; then
-  sudo docker system prune --all
-  sudo docker volume prune
-  sudo docker compose up -d
-  #sudo docker compose up --build --force-recreate --no-deps
-elif [ "$1" = "--build" -o "$1" = "-b" ]; then
-  sudo docker compose up --build -d
-else
-  sudo docker compose up -d
-fi
+#!/bin/bash
+
+# cd & check
+if ! cd "$(dirname "$0")"; then exit; fi
+
+if [ "$1" = "--reset" -o "$1" = "-b" ]; then
+  sudo docker system prune --all
+  sudo docker volume prune
+  sudo docker compose up -d
+  #sudo docker compose up --build --force-recreate --no-deps
+elif [ "$1" = "--build" -o "$1" = "-b" ]; then
+  sudo docker compose up --build -d
+else
+  sudo docker compose up -d
+fi

src/Software/stop.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
-
-# cd & check
-if ! cd "$(dirname "$0")"; then exit; fi
-
-sudo docker compose down
+#!/bin/bash
+
+# cd & check
+if ! cd "$(dirname "$0")"; then exit; fi
+
+sudo docker compose down