diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh index 6a629e4f2..adc1e8098 100644 --- a/images/linux/scripts/installers/1604/basic.sh +++ b/images/linux/scripts/installers/1604/basic.sh @@ -23,8 +23,6 @@ apt-fast install -y --no-install-recommends \ libc++abi-dev \ libcurl3 \ libicu55 \ - libpython2.7 \ - libpython2.7-dev \ libunwind8 \ locales \ netcat \ @@ -83,8 +81,6 @@ DocumentInstalledItemIndent "libc++-dev" DocumentInstalledItemIndent "libc++abi-dev" DocumentInstalledItemIndent "libcurl3" DocumentInstalledItemIndent "libicu55" -DocumentInstalledItemIndent "libpython2.7" -DocumentInstalledItemIndent "libpython2.7-dev" DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "netcat" diff --git a/images/linux/scripts/installers/1804/basic.sh b/images/linux/scripts/installers/1804/basic.sh index 84f3790ff..c12c7a819 100644 --- a/images/linux/scripts/installers/1804/basic.sh +++ b/images/linux/scripts/installers/1804/basic.sh @@ -31,12 +31,6 @@ apt-get install -y --no-install-recommends jq echo "Install libcurl3" apt-get install -y --no-install-recommends libcurl3 -echo "Install libpython2.7" -apt-get install -y --no-install-recommends libpython2.7 - -echo "Install libpython2.7-dev" -apt-get install -y --no-install-recommends libpython2.7-dev - echo "Install libunwind8" apt-get install -y --no-install-recommends libunwind8 @@ -154,8 +148,6 @@ DocumentInstalledItemIndent "iputils-ping" DocumentInstalledItemIndent "jq" DocumentInstalledItemIndent "libcurl3" DocumentInstalledItemIndent "libicu55" -DocumentInstalledItemIndent "libpython2.7" -DocumentInstalledItemIndent "libpython2.7-dev" DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "netcat" diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh index 103e92861..36c70571f 100644 --- a/images/linux/scripts/installers/swift.sh +++ b/images/linux/scripts/installers/swift.sh @@ -10,12 +10,12 @@ 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 +mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift -SWIFT_DIR="/usr/share/swift/usr/bin/swift" +SWIFT_BIN="/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 +ln -s "$SWIFT_BIN" /usr/local/bin/swift +echo "SWIFT_PATH=$SWIFT_PATH" | 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"