From be1a59d959cda28f462cc69ec95ce775e7902230 Mon Sep 17 00:00:00 2001 From: Bradley Bickford Date: Sat, 7 Dec 2024 21:57:19 -0500 Subject: [PATCH] Fixes for Powershell profile variables --- Dockerfile.pwsh.fedora | 6 +++--- Dockerfile.pwsh.ubuntu | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.pwsh.fedora b/Dockerfile.pwsh.fedora index 7808841..b9d9115 100644 --- a/Dockerfile.pwsh.fedora +++ b/Dockerfile.pwsh.fedora @@ -50,9 +50,9 @@ RUN chmod 755 /usr/bin/entrypoint.sh \ && chown -R coder:coder $GRADLEFOLDER \ && mkdir -p /home/coder/.config/powershell \ && chown -R coder:coder /home/coder/.config \ - && echo "\$JAVA_HOME=/home/coder/wpilib/$ARTIFACTSYEAR/jdk" >> "/home/coder/.config/powershell/Microsoft.PowerShell_profile.ps1" \ - && echo "\$env:PATH+=:/home/coder/wpilib/$ARTIFACTSYEAR/jdk/bin" >> "/home/coder/.config/powershell/Microsoft.PowerShell_profile.ps1" \ - && echo "\$env:PATH+=:$GRADLEFOLDER/bin" >> "/home/coder/.config/powershell/Microsoft.PowerShell_profile.ps1" \ + && echo "\$JAVA_HOME=\"/home/coder/wpilib/$ARTIFACTSYEAR/jdk\"" >> "/home/coder/.config/powershell/Microsoft.PowerShell_profile.ps1" \ + && echo "\$env:PATH+=\":/home/coder/wpilib/$ARTIFACTSYEAR/jdk/bin\"" >> "/home/coder/.config/powershell/Microsoft.PowerShell_profile.ps1" \ + && echo "\$env:PATH+=\":$GRADLEFOLDER/bin\"" >> "/home/coder/.config/powershell/Microsoft.PowerShell_profile.ps1" \ && su -c "/home/coder/wpilib/$ARTIFACTSYEAR/jdk/bin/java -jar /home/coder/wpilib/$ARTIFACTSYEAR/maven/MavenMetaDataFixer.jar" "coder" \ && rm -rf /home/coder/wpilib/$ARTIFACTSYEAR/advantagescope \ && rm -f /home/coder/wpilib/$ARTIFACTSYEAR/installUtils/$GRADLEZIP \ diff --git a/Dockerfile.pwsh.ubuntu b/Dockerfile.pwsh.ubuntu index f3b3097..8a9488b 100644 --- a/Dockerfile.pwsh.ubuntu +++ b/Dockerfile.pwsh.ubuntu @@ -51,9 +51,9 @@ RUN chmod 755 /usr/bin/entrypoint.sh \ && chown -R ubuntu:ubuntu $GRADLEFOLDER \ && mkdir -p /home/ubuntu/.config/powershell \ && chown -R ubuntu:ubuntu /home/ubuntu/.config \ - && echo "\$JAVA_HOME=/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ - && echo "\$env:PATH+=:/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk/bin" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ - && echo "\$env:PATH+=:$GRADLEFOLDER/bin" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ + && echo "\$JAVA_HOME=\"/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk\"" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ + && echo "\$env:PATH+=\":/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk/bin\"" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ + && echo "\$env:PATH+=\":$GRADLEFOLDER/bin\"" >> "/home/ubuntu/.config/powershell/Microsoft.PowerShell_profile.ps1" \ && su -c "/home/ubuntu/wpilib/$ARTIFACTSYEAR/jdk/bin/java -jar /home/ubuntu/wpilib/$ARTIFACTSYEAR/maven/MavenMetaDataFixer.jar" "ubuntu" \ && rm -rf /home/ubuntu/wpilib/$ARTIFACTSYEAR/advantagescope \ && rm -f /home/ubuntu/wpilib/$ARTIFACTSYEAR/installUtils/$GRADLEZIP \