From 0ac938f2916391d0738c7c738f4bb17261da1ee1 Mon Sep 17 00:00:00 2001 From: zontreck Date: Wed, 13 Nov 2024 15:06:52 -0700 Subject: [PATCH] Change agent keys and names --- ArchAgent/entrypoint.sh | 2 +- LinuxGeneralCompiler/entrypoint.sh | 2 +- mkdotenv.sh | 12 ++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ArchAgent/entrypoint.sh b/ArchAgent/entrypoint.sh index 157811e..da7a8c3 100644 --- a/ArchAgent/entrypoint.sh +++ b/ArchAgent/entrypoint.sh @@ -1,3 +1,3 @@ #!/bin/bash -java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$ARCHAGENT" -name "Arch" -workDir "/builder" +java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$ARCHAGENT" -name "Arch Linux" -workDir "/builder" diff --git a/LinuxGeneralCompiler/entrypoint.sh b/LinuxGeneralCompiler/entrypoint.sh index b8ed0ba..a9af9a9 100644 --- a/LinuxGeneralCompiler/entrypoint.sh +++ b/LinuxGeneralCompiler/entrypoint.sh @@ -2,4 +2,4 @@ echo $PUB | dart pub token add https://git.zontreck.com/api/packages/AriasCreations/pub -java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$AGENT" -name "Linux" -workDir "/builder" +java -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -jar /agent.jar -url "https://ci.zontreck.com" -secret "$AGENT" -name "Debian" -workDir "/builder" diff --git a/mkdotenv.sh b/mkdotenv.sh index 25e5718..b59810c 100644 --- a/mkdotenv.sh +++ b/mkdotenv.sh @@ -1,14 +1,11 @@ #!/bin/bash -echo -ne "AGENT=" > .env -cat "$AGENT" >> .env +echo -ne "AGENT=$AGENT" > .env -echo -ne "\nPUB=" >> .env -cat "$PUB" >> .env +echo -ne "\nPUB=$PUB" >> .env -echo -ne "\nFSAGENT=" >> .env -cat "$FSAGENT" >> .env +echo -ne "\nFSAGENT=$FSAGENT" >> .env mkdir -pv LinuxGeneralCompiler/FinalStage/secret cp "$PRIVKEY" LinuxGeneralCompiler/FinalStage/secret/id_rsa @@ -17,8 +14,7 @@ cp "$GRADLEPROP" LinuxGeneralCompiler/FinalStage/secret/gradle.properties cp -rv LinuxGeneralCompiler/FinalStage/secret ArchAgent/secret -echo -ne "\nARCHAGENT=" >> .env -cat "$ARCHAGENT" >> .env +echo -ne "\nARCHAGENT=$ARCHAGENT" >> .env echo -ne "\nDINDAGENT=" >> .env echo "NAN" >> .env \ No newline at end of file