diff --git a/alpine/nodejs18/entrypoint.sh b/alpine/nodejs18/entrypoint.sh index 7915796..9845f69 100644 --- a/alpine/nodejs18/entrypoint.sh +++ b/alpine/nodejs18/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}NodeJS Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Alpine: ${RED} $(cat /etc/alpine-release)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/alpine/nodejs20/entrypoint.sh b/alpine/nodejs20/entrypoint.sh index 7915796..9845f69 100644 --- a/alpine/nodejs20/entrypoint.sh +++ b/alpine/nodejs20/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}NodeJS Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Alpine: ${RED} $(cat /etc/alpine-release)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/apps/uptimekuma/entrypoint.sh b/apps/uptimekuma/entrypoint.sh index d4f60ec..fb36208 100644 --- a/apps/uptimekuma/entrypoint.sh +++ b/apps/uptimekuma/entrypoint.sh @@ -22,14 +22,14 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Uptime Kuma Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Alpine: ${RED} $(cat /etc/alpine-release)${NC}" echo -e "${YELLOW}Current timezone: ${RED} ${TZ} ${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}Cloudflared Version: ${RED} $(/usr/bin/cloudflared --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/bots/bastion/entrypoint.sh b/bots/bastion/entrypoint.sh index 576b4a3..1659ffc 100644 --- a/bots/bastion/entrypoint.sh +++ b/bots/bastion/entrypoint.sh @@ -9,19 +9,19 @@ NC='\033[0m' clear #show versions -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}BastionBot Installation${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Python Version: ${RED}$(python3 --version)${NC}" #echo -e "${YELLOW}Java Version: ${RED} $(java -version)${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}npm Version: ${RED} $(npm -v) ${NC}" echo -e "${YELLOW}yarn Version: ${RED} $(yarn --version) ${NC}" echo -e "${YELLOW}MongoDB Version: ${RED}$(mongod --version)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" cd /home/container @@ -34,15 +34,15 @@ MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/ echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}" # start mongo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting MongoDB...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done # Run the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}BastionBot starting...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" eval ${MODIFIED_STARTUP} # stop mongo diff --git a/bots/championbots/entrypoint.sh b/bots/championbots/entrypoint.sh index 3ec4b6a..72959bf 100644 --- a/bots/championbots/entrypoint.sh +++ b/bots/championbots/entrypoint.sh @@ -22,33 +22,33 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}ChampionsBot Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Java Version: ${RED} $(java -version)${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}npm Version: ${RED} $(npm -v) ${NC}" echo -e "${YELLOW}yarn Version: ${RED} $(yarn --version) ${NC}" echo -e "${YELLOW}MongoDB Version: ${RED}$(mongod --version)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}" # start mongo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting MongoDB...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done # Run the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting ChampionBot${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" eval ${MODIFIED_STARTUP} # stop mongo diff --git a/bots/corvin/entrypoint.sh b/bots/corvin/entrypoint.sh index 404e073..8a97cb6 100644 --- a/bots/corvin/entrypoint.sh +++ b/bots/corvin/entrypoint.sh @@ -9,16 +9,16 @@ NC='\033[0m' clear #show versions -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}CorvinBot Installation${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}MongoDB Version:${NC} " && mongod --version echo -e "${YELLOW}NodeJS Version:${NC} " && node -v echo -e "${YELLOW}NPM Version:${NC} " && npm -v echo -e "${YELLOW}Java Version:${NC} " && java -version echo -e "${YELLOW}Running on Debian:${NC} " && cat /etc/debian_version echo -e "${YELLOW}Current timezone:${NC} " && cat /etc/timezone -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" cd /home/container @@ -31,15 +31,15 @@ MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/ echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}" # start mongo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting MongoDB...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done # Run the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting CorvinBot${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" eval ${MODIFIED_STARTUP} # stop mongo diff --git a/bots/multibot/entrypoint.sh b/bots/multibot/entrypoint.sh index 157258d..85c0535 100644 --- a/bots/multibot/entrypoint.sh +++ b/bots/multibot/entrypoint.sh @@ -22,32 +22,32 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Multi-Bot Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on: ${RED} $(. /etc/os-release ; echo $NAME $VERSION)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}npm Version: ${RED} $(npm -v) ${NC}" echo -e "${YELLOW}yarn Version: ${RED} $(yarn --version) ${NC}" echo -e "${YELLOW}MongoDB Version: ${RED}$(mongod --version)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}" # start mongo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting MongoDB...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done # Run the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting Multi-Bot${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" eval ${MODIFIED_STARTUP} # stop mongo diff --git a/bots/nodemongo/entrypoint.sh b/bots/nodemongo/entrypoint.sh index 45a2bda..082f93b 100644 --- a/bots/nodemongo/entrypoint.sh +++ b/bots/nodemongo/entrypoint.sh @@ -22,32 +22,32 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}NodeJS & MongoDB Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on: ${RED} $(. /etc/os-release ; echo $NAME $VERSION)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}npm Version: ${RED} $(npm -v) ${NC}" echo -e "${YELLOW}yarn Version: ${RED} $(yarn --version) ${NC}" echo -e "${YELLOW}MongoDB Version: ${RED}$(mongod --version)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}" # start mongo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting MongoDB...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done # Run the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting Bot...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" eval ${MODIFIED_STARTUP} # stop mongo diff --git a/bots/sinusbot/entrypoint.sh b/bots/sinusbot/entrypoint.sh index b73d832..23901c9 100644 --- a/bots/sinusbot/entrypoint.sh +++ b/bots/sinusbot/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Sinusbot Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/box64/entrypoint.sh b/box64/entrypoint.sh index d0e49f1..0a547dd 100644 --- a/box64/entrypoint.sh +++ b/box64/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # System informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Box64 (Quinten) Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" #echo -e "${YELLOW}Dart Version: ${RED} $(dart --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/database/keydb/entrypoint.sh b/database/keydb/entrypoint.sh index 6bbcae6..cc49da1 100644 --- a/database/keydb/entrypoint.sh +++ b/database/keydb/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}KeyDB Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}KeyDB Version: ${RED} $(keydb-server --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/database/mariadb/entrypoint.sh b/database/mariadb/entrypoint.sh index 964ef5f..e67d4bf 100644 --- a/database/mariadb/entrypoint.sh +++ b/database/mariadb/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}MariaDB Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}MariaDB Version: ${RED} $(mariadb --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/database/mongodb/entrypoint.sh b/database/mongodb/entrypoint.sh index 6f25ae9..9116fe8 100644 --- a/database/mongodb/entrypoint.sh +++ b/database/mongodb/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}MongoDB Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}MongoDB Version: ${RED} $(mongo --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/database/postgres/entrypoint.sh b/database/postgres/entrypoint.sh index fb660d0..5d0abfb 100644 --- a/database/postgres/entrypoint.sh +++ b/database/postgres/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Postgres Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Postgres Version: ${RED} $(postgres --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` diff --git a/database/redis/entrypoint.sh b/database/redis/entrypoint.sh index e5e8acc..d5d1bec 100644 --- a/database/redis/entrypoint.sh +++ b/database/redis/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Redis Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Redis Version: ${RED} $(redis-server --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/depotdl/entrypoint.sh b/depotdl/entrypoint.sh index 1106d32..8b89a10 100644 --- a/depotdl/entrypoint.sh +++ b/depotdl/entrypoint.sh @@ -19,13 +19,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}SteamCMD Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Set environment for Steam Proton if [ -f "/usr/local/bin/proton" ]; then @@ -50,23 +50,23 @@ fi # Switch to the container's working directory cd /home/container || exit 1 -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -79,9 +79,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 DepotDownloader -dir /home/container -username ${STEAM_USER} -password ${STEAM_PASS} -remember-password $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '-os windows' ) -app 1007 -app ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${VALIDATE} ]] || printf %s "-validate" ) fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/dev/dart/entrypoint.sh b/dev/dart/entrypoint.sh index d6c1e7e..bc7682f 100644 --- a/dev/dart/entrypoint.sh +++ b/dev/dart/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # System informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}NodeJS Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Dart Version: ${RED} $(dart --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically diff --git a/dev/dotnet/entrypoint.sh b/dev/dotnet/entrypoint.sh index 640b947..2282995 100644 --- a/dev/dotnet/entrypoint.sh +++ b/dev/dotnet/entrypoint.sh @@ -25,14 +25,14 @@ export INTERNAL_IP export DOTNET_ROOT=/usr/share/ # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}DotNet Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables diff --git a/dev/nodejs/entrypoint.sh b/dev/nodejs/entrypoint.sh index e0b3c62..b32370a 100644 --- a/dev/nodejs/entrypoint.sh +++ b/dev/nodejs/entrypoint.sh @@ -22,16 +22,16 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}NodeJS Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}NodeJS Version: ${RED} $(node -v) ${NC}" echo -e "${YELLOW}npm Version: ${RED} $(npm -v) ${NC}" echo -e "${YELLOW}yarn Version: ${RED} $(yarn --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/dev/python/entrypoint.sh b/dev/python/entrypoint.sh index 7ce7d4f..55d4a64 100644 --- a/dev/python/entrypoint.sh +++ b/dev/python/entrypoint.sh @@ -22,13 +22,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Python Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Python Version: ${RED} $(python --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')) diff --git a/distros/debian/10-buster/entrypoint.sh b/distros/debian/10-buster/entrypoint.sh index 37c5580..53e19cf 100644 --- a/distros/debian/10-buster/entrypoint.sh +++ b/distros/debian/10-buster/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Debian 10 Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/distros/debian/11-bullseye/entrypoint.sh b/distros/debian/11-bullseye/entrypoint.sh index a85d576..51d5d7b 100644 --- a/distros/debian/11-bullseye/entrypoint.sh +++ b/distros/debian/11-bullseye/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Debian 11 Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/distros/debian/12-bookworm/entrypoint.sh b/distros/debian/12-bookworm/entrypoint.sh index 6b8596c..eb60db0 100644 --- a/distros/debian/12-bookworm/entrypoint.sh +++ b/distros/debian/12-bookworm/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Debian 12 Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/distros/ubuntu/18-bionic/entrypoint.sh b/distros/ubuntu/18-bionic/entrypoint.sh index 537d145..3bcf410 100644 --- a/distros/ubuntu/18-bionic/entrypoint.sh +++ b/distros/ubuntu/18-bionic/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Ubuntu Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Ubuntu ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/distros/ubuntu/20-focal/entrypoint.sh b/distros/ubuntu/20-focal/entrypoint.sh index 537d145..3bcf410 100644 --- a/distros/ubuntu/20-focal/entrypoint.sh +++ b/distros/ubuntu/20-focal/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Ubuntu Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Ubuntu ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/distros/ubuntu/22-jammy/entrypoint.sh b/distros/ubuntu/22-jammy/entrypoint.sh index 537d145..3bcf410 100644 --- a/distros/ubuntu/22-jammy/entrypoint.sh +++ b/distros/ubuntu/22-jammy/entrypoint.sh @@ -22,12 +22,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Ubuntu Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Ubuntu ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Replace Startup Variables MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g') diff --git a/games/bannerlord/entrypoint.sh b/games/bannerlord/entrypoint.sh index 78695aa..c93f899 100644 --- a/games/bannerlord/entrypoint.sh +++ b/games/bannerlord/entrypoint.sh @@ -20,20 +20,20 @@ export INTERNAL_IP # Information output if [ -f "/usr/local/bin/proton" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}SteamCMD Proton Image by gOOvER${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}SteamCMD Image by gOOvER${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi # Set environment for Steam Proton @@ -61,23 +61,23 @@ cd /home/container || exit 1 dotnetinfo=$(dotnet --info) echo $dotnetinfo >| dotnet_info.txt -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -90,9 +90,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/games/conan/entrypoint.sh b/games/conan/entrypoint.sh index bb94228..08ceded 100644 --- a/games/conan/entrypoint.sh +++ b/games/conan/entrypoint.sh @@ -10,10 +10,10 @@ cd /home/container # Information output echo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Conan Exile Docker Image with Mod Support${NC}" echo -e "${YELLOW}Copyright 2023 by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo "Running on Debian $(cat /etc/debian_version)" echo "Current timezone: $(cat /etc/timezone)" wine --version @@ -24,17 +24,17 @@ export INTERNAL_IP ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set.\n ${NC}" echo -e "${YELLOW}Using anonymous user.\n ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -47,9 +47,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else echo -e "${BLUE}---------------------------------------------------------------${NC}" @@ -59,9 +59,9 @@ fi ## updating mods if [ -z ${MODS_UPDATE} ] || [ "${MODS_UPDATE}" == "1" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}updating mods...${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAMSERVERID=440900 @@ -71,9 +71,9 @@ GAMEMODLIST=${GAMEMODDIR}/modlist.txt cd /home/container if [ ! -f ./modlist.txt ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}found no modlist.txt. creating one...${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" touch ./modlist.txt echo -e "${GREEN}[DONE]${NC}" fi @@ -91,9 +91,9 @@ done MODCMD="${MODCMD} +quit" ${MODCMD} -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}linking mods...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mkdir -p ${GAMEMODDIR} # make dir to prevent errors mkdir -p /home/container/Steam/steamapps/workshop @@ -121,9 +121,9 @@ mkdir -p $WINEPREFIX # Check if wine-gecko required and install it if so if [[ $WINETRICKS_RUN =~ gecko ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing Wine Gecko${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" WINETRICKS_RUN=${WINETRICKS_RUN/gecko} if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then @@ -140,9 +140,9 @@ fi # Check if wine-mono required and install it if so if [[ $WINETRICKS_RUN =~ mono ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing Wine Mono${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" WINETRICKS_RUN=${WINETRICKS_RUN/mono} if [ ! -f "$WINEPREFIX/mono.msi" ]; then @@ -154,9 +154,9 @@ fi # List and install other packages for trick in $WINETRICKS_RUN; do - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing: ${NC} ${GREEN} $trick ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" winetricks -q $trick done diff --git a/games/dayz/entrypoint.sh b/games/dayz/entrypoint.sh index d09d33d..f6808e4 100644 --- a/games/dayz/entrypoint.sh +++ b/games/dayz/entrypoint.sh @@ -40,9 +40,9 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id] updateAttempt=$((updateAttempt+1)) if (( $updateAttempt > 1 )); then # Notify if not first attempt - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\t${YELLOW}Re-Attempting download/update in 3 seconds...${NC} (Attempt ${CYAN}${updateAttempt}${NC} of ${CYAN}${STEAMCMD_ATTEMPTS}${NC})\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" sleep 3 fi @@ -58,70 +58,70 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id] if [[ -n $(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL") ]]; then # Catch errors (ignore setlocale and SDL warnings) # Soft errors if [[ -n $(grep -i "Timeout downloading item" "${STEAMCMD_LOG}") ]]; then # Mod download timeout - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${YELLOW}[UPDATE]: ${NC}Timeout downloading Steam Workshop mod: \"${CYAN}${modName}${NC}\" (${CYAN}${2}${NC})" echo -e "\t(This is expected for particularly large mods)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" elif [[ -n $(grep -i "0x402\|0x6\|0x602" "${STEAMCMD_LOG}") ]]; then # Connection issue with Steam - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${YELLOW}[UPDATE]: ${NC}Connection issue with Steam servers." echo -e "\t(Steam servers may currently be down, or a connection cannot be made reliably)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Hard errors elif [[ -n $(grep -i "Password check for AppId" "${STEAMCMD_LOG}") ]]; then # Incorrect beta branch password - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: ${YELLOW}Incorrect password given for beta branch. ${CYAN}Skipping download...${NC}" echo -e "\t(Check your \"[ADVANCED] EXTRA FLAGS FOR STEAMCMD\" startup parameter)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" break # Fatal errors elif [[ -n $(grep -i "Invalid Password\|two-factor\|No subscription" "${STEAMCMD_LOG}") ]]; then # Wrong username/password, Steam Guard is turned on, or host is using anonymous account - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: Cannot login to Steam - Improperly configured account and/or credentials" echo -e "\t${YELLOW}Please contact your administrator/host and give them the following message:${NC}" echo -e "\t${CYAN}Your Egg, or your client's server, is not configured with valid Steam credentials.${NC}" echo -e "\t${CYAN}Either the username/password is wrong, or Steam Guard is not properly configured\n\taccording to this egg's documentation/README.${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit 1 elif [[ -n $(grep -i "Download item" "${STEAMCMD_LOG}") ]]; then # Steam account does not own base game for mod downloads, or unknown - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: Cannot download mod - Download failed" echo -e "\t${YELLOW}While unknown, this error is likely due to your host's Steam account not owning the base game.${NC}" echo -e "\t${YELLOW}(Please contact your administrator/host if this issue persists)${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit 1 elif [[ -n $(grep -i "0x202\|0x212" "${STEAMCMD_LOG}") ]]; then # Not enough disk space - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: Unable to complete download - Not enough storage" echo -e "\t${YELLOW}You have run out of your allotted disk space.${NC}" echo -e "\t${YELLOW}Please contact your administrator/host for potential storage upgrades.${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit 1 elif [[ -n $(grep -i "0x606" "${STEAMCMD_LOG}") ]]; then # Disk write failure - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: Unable to complete download - Disk write failure" echo -e "\t${YELLOW}This is normally caused by directory permissions issues,\n\tbut could be a more serious hardware issue.${NC}" echo -e "\t${YELLOW}(Please contact your administrator/host if this issue persists)${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit 1 else # Unknown caught error - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: ${YELLOW}An unknown error has occurred with SteamCMD. ${CYAN}Skipping download...${NC}" echo -e "\t(Please contact your administrator/host if this issue persists)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" break fi elif [[ $steamcmdExitCode != 0 ]]; then # Unknown fatal error - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[UPDATE]: SteamCMD has crashed for an unknown reason!${NC} (Exit code: ${CYAN}${steamcmdExitCode}${NC})" echo -e "\t${YELLOW}(Please contact your administrator/host for support)${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit $steamcmdExitCode else # Success! if [[ $1 == 0 ]]; then # Server - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${GREEN}[UPDATE]: Game server is up to date!${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" else # Mod # Move the downloaded mod to the root directory, and replace existing mod if needed mkdir -p ./@$2 @@ -131,28 +131,28 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id] # Make the mods contents all lowercase ModsLowercase @$2 # Move any .bikey's to the keys directory - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\tMoving any mod ${CYAN}.bikey${NC} files to the ${CYAN}~/keys/${NC} folder..." - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" find ./@$2 -name "*.bikey" -type f -exec cp {} ./keys \; - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}[UPDATE]: Mod download/update successful!${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi break fi if (( $updateAttempt == $STEAMCMD_ATTEMPTS )); then # Notify if failed last attempt if [[ $1 == 0 ]]; then # Server - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\t${RED}Final attempt made! ${YELLOW}Unable to complete game server update. ${CYAN}Skipping...${NC}" echo -e "\t(Please try again at a later time)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" sleep 3 else # Mod - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\t${RED}Final attempt made! ${YELLOW}Unable to complete mod download/update. ${CYAN}Skipping...${NC}" echo -e "\t(You may try again later, or manually upload this mod to your server via SFTP)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" sleep 3 fi fi @@ -161,9 +161,9 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id] # Takes a directory (string) as input, and recursively makes all files & folders lowercase. function ModsLowercase { - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n\tMaking mod ${CYAN}$1${NC} files/folders lowercase..." - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" for SRC in `find ./@$1 -depth` do DST=`dirname "${SRC}"`/`basename "${SRC}" | tr '[A-Z]' '[a-z]'` @@ -195,13 +195,14 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +clear +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}DayZ Image modified by gOOvER${NC}" echo -e "${RED}Origianl Image by Red-Thirten${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Switch to the container's working directory cd /home/container || exit 1 @@ -216,15 +217,15 @@ fi if [[ -f ${MOD_FILE} ]] && [[ -n "$(cat ${MOD_FILE} | grep 'Created by DayZ Launcher')" ]]; then CLIENT_MODS+=$(cat ${MOD_FILE} | grep 'id=' | cut -d'=' -f3 | cut -d'"' -f1 | xargs printf '@%s;') elif [[ -n "${MOD_FILE}" ]]; then # If MOD_FILE is not null, warn user file is missing or invalid - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${YELLOW}[STARTUP_WARN]: DayZ Modlist file \"${CYAN}${MOD_FILE}${YELLOW}\" could not be found, or is invalid!${NC}" echo -e "\tEnsure your uploaded modlist's file name matches your Startup Parameter." echo -e "\tOnly files exported from a DayZ Launcher are permitted." - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" if [[ -n "${CLIENT_MODS}" ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\t${CYAN}Reverting to the manual mod list...${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi fi # Add server mods to the master mods list, while checking for trailing semicolon @@ -240,20 +241,20 @@ allMods=$(echo $allMods | sed -e 's/;/ /g') # Convert from string to array # Update everything (server and mods), if specified if [[ ${UPDATE_SERVER} == 1 ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${GREEN}[STARTUP]: ${CYAN}Starting checks for all updates...${NC}" echo -e "(It is okay to ignore any \"SDL\" errors during this process)\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## Update game server - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}[UPDATE]:${NC} Checking for game server updates with App ID: ${CYAN}${STEAMCMD_APPID}${NC}..." - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" if [[ ${VALIDATE_SERVER} == 1 ]]; then # Validate will be added as a parameter if specified - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\t${CYAN}File validation enabled.${NC} (This may take extra time to complete)" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" validateServer="validate" else validateServer="" @@ -261,9 +262,9 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then # Determine what extra flags should be set if [[ -n ${STEAMCMD_EXTRA_FLAGS} ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\t(${YELLOW}Advanced${NC}) Extra SteamCMD flags specified: ${CYAN}${STEAMCMD_EXTRA_FLAGS}${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" extraFlags=${STEAMCMD_EXTRA_FLAGS} else echo -e "" @@ -274,9 +275,9 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then ## Update mods if [[ -n $allMods ]] && [[ ${DISABLE_MOD_UPDATES} != 1 ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${GREEN}[UPDATE]:${NC} Checking all ${CYAN}Steam Workshop mods${NC} for updates..." - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" for modID in $(echo $allMods | sed -e 's/@//g') do if [[ $modID =~ ^[0-9]+$ ]]; then # Only check mods that are in ID-form @@ -290,41 +291,41 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then modName="[NAME UNAVAILABLE]" fi if [[ ! -d @$modID ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${GREEN}[UPDATE]:${NC} Downloading new Mod: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${GREEN}[UPDATE]:${NC} Mod update found for: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi if [[ -n $latestUpdate ]] && [[ $latestUpdate =~ ^[0-9]+$ ]]; then # Notify last update date, if valid - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\tAttempting mod update/download via SteamCMD...\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" RunSteamCMD 1 $modID fi fi done - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}[UPDATE]:${NC} Steam Workshop mod update check ${GREEN}complete${NC}!" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi fi # Check if specified server binary exists. if [[ ! -f ./${SERVER_BINARY} ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}[STARTUP_ERR]: Specified DayZ server binary could not be found in the root directory!${NC}" echo -e "${YELLOW}Please do the following to resolve this issue:${NC}" echo -e "\t${CYAN}- Double check your \"Server Binary\" Startup Variable is correct.${NC}" echo -e "\t${CYAN}- Ensure your server has properly installed/updated without errors (reinstalling/updating again may help).${NC}" echo -e "\t${CYAN}- Use the File Manager to check that your specified server binary file is not missing from the root directory.${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit 1 fi @@ -346,15 +347,15 @@ export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libnss_wrapper.so modifiedStartup=`eval echo $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')` # Start the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${GREEN}[STARTUP]:${NC} Starting server with the following startup command:" echo -e "${CYAN}${modifiedStartup}${NC}\n" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ${modifiedStartup} if [ $? -ne 0 ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "\n${RED}PTDL_CONTAINER_ERR: There was an error while attempting to run the start command.${NC}\n" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" exit 1 fi diff --git a/games/longvinter/entrypoint.sh b/games/longvinter/entrypoint.sh index 16dea3c..293cdb0 100644 --- a/games/longvinter/entrypoint.sh +++ b/games/longvinter/entrypoint.sh @@ -19,13 +19,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}LongVinter Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Set environment for Steam Proton if [ -f "/usr/local/bin/proton" ]; then @@ -50,23 +50,23 @@ fi # Switch to the container's working directory cd /home/container || exit 1 -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -79,9 +79,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else @@ -93,9 +93,9 @@ fi ## Pull Server from Github if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then cd /home/container/longvinter-linux-server - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}checkig for Server update. please wait...${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" git restore . sleep 1 git stash @@ -112,9 +112,9 @@ fi ## updating mods if [ -z ${MODS_UPDATE} ] || [ "${MODS_UPDATE}" == "1" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}updating mods...${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAMSERVERID=1635450 @@ -124,9 +124,9 @@ GAMEMODLIST=${GAMEMODDIR}/modlist.txt cd /home/container if [ ! -f ./modlist.txt ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}found no modlist.txt. creating one...${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" touch ./modlist.txt echo -e "${GREEN}[DONE]${NC}" fi @@ -144,9 +144,9 @@ done MODCMD="${MODCMD} +quit" ${MODCMD} -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}linking mods...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mkdir -p ${GAMEMODDIR} # make dir to prevent errors mkdir -p /home/container/Steam/steamapps/workshop diff --git a/games/palworld/entrypoint.sh b/games/palworld/entrypoint.sh index 606121b..dd5524a 100644 --- a/games/palworld/entrypoint.sh +++ b/games/palworld/entrypoint.sh @@ -19,13 +19,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}SteamCMD Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Switch to the container's working directory cd /home/container || exit 1 @@ -34,23 +34,23 @@ cd /home/container || exit 1 #dotnetinfo=$(dotnet --info) #echo $dotnetinfo >| dotnet_info.txt -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -63,9 +63,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/games/quakeliveqlx/entrypoint.sh b/games/quakeliveqlx/entrypoint.sh index 5888335..d5c7b4a 100644 --- a/games/quakeliveqlx/entrypoint.sh +++ b/games/quakeliveqlx/entrypoint.sh @@ -19,13 +19,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}SteamCMD Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Switch to the container's working directory cd /home/container || exit 1 @@ -34,23 +34,23 @@ cd /home/container || exit 1 #dotnetinfo=$(dotnet --info) #echo $dotnetinfo >| dotnet_info.txt -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -63,9 +63,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/games/riskofrain2/entrypoint.sh b/games/riskofrain2/entrypoint.sh index f115f85..d719945 100644 --- a/games/riskofrain2/entrypoint.sh +++ b/games/riskofrain2/entrypoint.sh @@ -66,9 +66,9 @@ mkdir -p $WINEPREFIX # Check if wine-gecko required and install it if so if [[ $WINETRICKS_RUN =~ gecko ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing Wine Gecko${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" WINETRICKS_RUN=${WINETRICKS_RUN/gecko} if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then @@ -85,9 +85,9 @@ fi # Check if wine-mono required and install it if so if [[ $WINETRICKS_RUN =~ mono ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing Wine Mono${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" WINETRICKS_RUN=${WINETRICKS_RUN/mono} if [ ! -f "$WINEPREFIX/mono.msi" ]; then @@ -99,9 +99,9 @@ fi # List and install other packages for trick in $WINETRICKS_RUN; do - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing: ${NC} ${GREEN} $trick ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" winetricks -q $trick done diff --git a/games/screeps/entrypoint.sh b/games/screeps/entrypoint.sh index 2fe2380..ffdf82c 100644 --- a/games/screeps/entrypoint.sh +++ b/games/screeps/entrypoint.sh @@ -9,9 +9,9 @@ NC='\033[0m' clear #show versions -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Screeps Installation${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}MongoDB Version:${NC} " && mongod --version echo -e "${YELLOW}Redis Version:${NC} " && redis-server --version echo -e "${YELLOW}NodeJS Version:${NC} " && node -v @@ -19,7 +19,7 @@ echo -e "${YELLOW}NPM Version:${NC} " && npm -v #echo -e "${YELLOW}Java Version:${NC} " && java -version echo -e "${YELLOW}Running on Debian:${NC} " && cat /etc/debian_version echo -e "${YELLOW}Current timezone:${NC} " && cat /etc/timezone -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" cd /home/container @@ -32,15 +32,15 @@ MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/ echo -e "${YELLOW}:/home/container${NC} ${MODIFIED_STARTUP}" # start mongo -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting MongoDB...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mongod --fork --dbpath /home/container/mongodb/ --port 27017 --logpath /home/container/mongod.log --logRotate reopen --logappend && until nc -z -v -w5 127.0.0.1 27017; do echo 'Waiting for mongodb connection...'; sleep 5; done # Run the Server -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}starting Screeps Server${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" eval ${MODIFIED_STARTUP} # stop mongo diff --git a/games/thefront/entrypoint.sh b/games/thefront/entrypoint.sh index a29d3c1..2195487 100644 --- a/games/thefront/entrypoint.sh +++ b/games/thefront/entrypoint.sh @@ -19,29 +19,29 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}The Front Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Switch to the container's working directory cd /home/container || exit 1 ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set.\n ${NC}" echo -e "${YELLOW}Using anonymous user.\n ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -54,9 +54,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/games/valheim/entrypoint.sh b/games/valheim/entrypoint.sh index 7fd5d47..c8d7a3b 100644 --- a/games/valheim/entrypoint.sh +++ b/games/valheim/entrypoint.sh @@ -19,12 +19,12 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Valheim Image${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}$(lsb_release -a)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Set environment for Steam Proton if [ -f "/usr/local/bin/proton" ]; then @@ -49,23 +49,23 @@ fi # Switch to the container's working directory cd /home/container || exit 1 -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -78,9 +78,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/games/wurm/entrypoint.sh b/games/wurm/entrypoint.sh index b437abe..7922747 100644 --- a/games/wurm/entrypoint.sh +++ b/games/wurm/entrypoint.sh @@ -20,11 +20,11 @@ IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@pterodactyl~ \033[0m'} export IMAGE_PROMPT # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Java Version:${NC} ${RED} $(java -version)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Set environment variable that holds the Internal Docker IP INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') @@ -35,17 +35,17 @@ cd /home/container || exit 1 ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set.\n ${NC}" echo -e "${YELLOW}Using anonymous user.\n ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -58,9 +58,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) $( [[ -z ${HLDS_GAME} ]] || printf %s "+app_set_config 90 mod ${HLDS_GAME}" ) $( [[ -z ${VALIDATE} ]] || printf %s "validate" ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/java/base/entrypoint.sh b/java/base/entrypoint.sh index ab51e7f..2038aed 100644 --- a/java/base/entrypoint.sh +++ b/java/base/entrypoint.sh @@ -23,13 +23,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Java Base Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Java Version: ${RED} $(java -version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically diff --git a/java/corretto/entrypoint.sh b/java/corretto/entrypoint.sh index e6e46f0..8940652 100644 --- a/java/corretto/entrypoint.sh +++ b/java/corretto/entrypoint.sh @@ -23,13 +23,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # system informations -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}Java Corretto Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Java Version: ${RED} $(java -version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Convert all of the "{{VARIABLE}}" parts of the command into the expected shell # variable format of "${VARIABLE}" before evaluating the string and automatically diff --git a/steam/entrypoint.sh b/steam/entrypoint.sh index 2446dd6..ff63b55 100644 --- a/steam/entrypoint.sh +++ b/steam/entrypoint.sh @@ -95,9 +95,9 @@ echo -e "${BLUE}---------------------------------------------------------------- # List and install other packages for trick in $PROTONTRICKS_RUN; do - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing: ${NC} ${GREEN} $trick ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" flatpak run com.github.Matoking.protontricks ${SRCDS_APPID} $trick done diff --git a/steamcmd/entrypoint.sh b/steamcmd/entrypoint.sh index d48dc34..6ff312e 100644 --- a/steamcmd/entrypoint.sh +++ b/steamcmd/entrypoint.sh @@ -19,13 +19,13 @@ INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') export INTERNAL_IP # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}SteamCMD Image by gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian: ${RED} $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: ${RED} $(cat /etc/timezone)${NC}" echo -e "${YELLOW}DotNet Version: ${RED} $(dotnet --version) ${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Switch to the container's working directory cd /home/container || exit 1 @@ -34,23 +34,23 @@ cd /home/container || exit 1 #dotnetinfo=$(dotnet --info) #echo $dotnetinfo >| dotnet_info.txt -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${GREEN}Starting Server.... Please wait...${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set. ${NC}" echo -e "${YELLOW}Using anonymous user.${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -63,9 +63,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) $( [[ "${STEAM_SDK}" == "1" ]] && printf %s '+app_update 1007' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) ${INSTALL_FLAGS} $( [[ "${VALIDATE}" == "1" ]] && printf %s 'validate' ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh index de4f892..d8aae5d 100644 --- a/wine/entrypoint.sh +++ b/wine/entrypoint.sh @@ -20,13 +20,13 @@ IMAGE_PROMPT=${IMAGE_PROMPT:-$'\033[1m\033[33mcontainer@pterodactyl~ \033[0m'} export IMAGE_PROMPT # Information output -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Wine Image from gOOvER${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Running on Debian $(cat /etc/debian_version)${NC}" echo -e "${YELLOW}Current timezone: $(cat /etc/timezone)${NC}" echo -e "${YELLOW}Wine Version:${NC} ${RED} $(wine --version)${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" # Set environment variable that holds the Internal Docker IP INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}') @@ -37,17 +37,17 @@ cd /home/container || exit 1 ## just in case someone removed the defaults. if [ "${STEAM_USER}" == "" ]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Steam user is not set.\n ${NC}" echo -e "${YELLOW}Using anonymous user.\n ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" STEAM_USER=anonymous STEAM_PASS="" STEAM_AUTH="" else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}user set to ${STEAM_USER} ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi ## if auto_update is not set or to 1 update @@ -60,9 +60,9 @@ if [ -z ${AUTO_UPDATE} ] || [ "${AUTO_UPDATE}" == "1" ]; then numactl --physcpubind=+0 ./steamcmd/steamcmd.sh +force_install_dir /home/container +login ${STEAM_USER} ${STEAM_PASS} ${STEAM_AUTH} $( [[ "${WINDOWS_INSTALL}" == "1" ]] && printf %s '+@sSteamCmdForcePlatformType windows' ) $( [[ "${STEAM_SDK}" == "1" ]] && printf %s '+app_update 1007' ) +app_update ${SRCDS_APPID} $( [[ -z ${SRCDS_BETAID} ]] || printf %s "-beta ${SRCDS_BETAID}" ) $( [[ -z ${SRCDS_BETAPASS} ]] || printf %s "-betapassword ${SRCDS_BETAPASS}" ) ${INSTALL_FLAGS} $( [[ "${VALIDATE}" == "1" ]] && printf %s 'validate' ) +quit fi else - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}No appid set. Starting Server${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" fi else @@ -76,16 +76,16 @@ if [[ $XVFB == 1 ]]; then fi # Install necessary to run packages -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${RED}First launch will throw some errors. Ignore them${NC}" -echo -e "${BLUE}-------------------------------------------------${NC}" +echo -e "${BLUE}---------------------------------------------------------------------${NC}" mkdir -p $WINEPREFIX # Check if wine-gecko required and install it if so if [[ $WINETRICKS_RUN =~ gecko ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing Wine Gecko${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" WINETRICKS_RUN=${WINETRICKS_RUN/gecko} if [ ! -f "$WINEPREFIX/gecko_x86.msi" ]; then @@ -102,9 +102,9 @@ fi # Check if wine-mono required and install it if so if [[ $WINETRICKS_RUN =~ mono ]]; then - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing Wine Mono${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" WINETRICKS_RUN=${WINETRICKS_RUN/mono} if [ ! -f "$WINEPREFIX/mono.msi" ]; then @@ -116,9 +116,9 @@ fi # List and install other packages for trick in $WINETRICKS_RUN; do - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" echo -e "${YELLOW}Installing: ${NC} ${GREEN} $trick ${NC}" - echo -e "${BLUE}-------------------------------------------------${NC}" + echo -e "${BLUE}---------------------------------------------------------------------${NC}" winetricks -q $trick done