diff --git a/scripts/start.sh b/scripts/start.sh index e848af5..9abd8cb 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1,24 +1,30 @@ #!/bin/bash -echo "---Checking if UID: ${UID} matches user---" +echo "---Ensuring UID: ${UID} matches user---" usermod -u ${UID} ${USER} -echo "---Checking if GID: ${GID} matches user---" +echo "---Ensuring GID: ${GID} matches user---" +groupmod -g ${GID} ${USER} > /dev/null 2>&1 ||: usermod -g ${GID} ${USER} echo "---Setting umask to ${UMASK}---" umask ${UMASK} echo "---Checking for optional scripts---" -if [ -f /opt/scripts/user.sh ]; then - echo "---Found optional script, executing---" - chmod +x /opt/scripts/user.sh - /opt/scripts/user.sh +cp -f /opt/custom/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||: +cp -f /opt/scripts/user.sh /opt/scripts/start-user.sh > /dev/null 2>&1 ||: + +if [ -f /opt/scripts/start-user.sh ]; then + echo "---Found optional script, executing---" + chmod -f +x /opt/scripts/start-user.sh.sh ||: + /opt/scripts/start-user.sh || echo "---Optional Script has thrown an Error---" else - echo "---No optional script found, continuing---" + echo "---No optional script found, continuing---" fi -echo "---Starting...---" -chown -R ${UID}:${GID} /opt/scripts +echo "---Taking ownership of data...---" +chown -R root:${GID} /opt/scripts +chmod -R 750 /opt/scripts chown -R ${UID}:${GID} ${DATA_DIR} +echo "---Starting...---" term_handler() { kill -SIGTERM "$killpid" wait "$killpid" -f 2>/dev/null