diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index 23dd0d06..103e9286 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -6,11 +6,16 @@ # Install # Install image_label="$(lsb_release -rs)" -wget https://swift.org/builds/swift-5.1.5-release/ubuntu${image_label//./}/swift-5.1.5-RELEASE/swift-5.1.5-RELEASE-ubuntu$image_label.tar.gz -tar xzf swift-5.1.5-RELEASE-ubuntu$image_label.tar.gz -sudo mv swift-5.1.5-RELEASE-ubuntu$image_label /usr/share/swift -sudo echo "PATH=/usr/share/swift/usr/bin:$PATH" | sudo tee -a /etc/environment -source ~/.bashrc +swift_version="5.1.5" + +wget -P /tmp https://swift.org/builds/swift-$swift_version-release/ubuntu${image_label//./}/swift-$swift_version-RELEASE/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz +tar xzf /tmp/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz +sudo mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift + +SWIFT_DIR="/usr/share/swift/usr/bin/swift" +SWIFT_PATH="/usr/share/swift/usr/bin" +sudo ln -s "$SWIFT_DIR" /usr/local/bin/swift +echo "SWIFT_PATH =$SWIFT_PATH" | sudo tee -a /etc/environment # Run tests to determine that the software installed as expected echo "Testing to make sure that script performed as expected, and basic scenarios work" @@ -21,4 +26,4 @@ fi # Document what was added to the image echo "Lastly, documenting what we added to the metadata file" -DocumentInstalledItem "$(swift --version)" \ No newline at end of file +DocumentInstalledItem "$(swift --version)"