removed unused libs and fixed swift.sh

This commit is contained in:
Nikita Bykov
2020-03-24 16:28:01 +03:00
parent 0903a6eaf2
commit 6f557cf84c
3 changed files with 4 additions and 16 deletions

View File

@@ -23,8 +23,6 @@ apt-fast install -y --no-install-recommends \
libc++abi-dev \ libc++abi-dev \
libcurl3 \ libcurl3 \
libicu55 \ libicu55 \
libpython2.7 \
libpython2.7-dev \
libunwind8 \ libunwind8 \
locales \ locales \
netcat \ netcat \
@@ -83,8 +81,6 @@ DocumentInstalledItemIndent "libc++-dev"
DocumentInstalledItemIndent "libc++abi-dev" DocumentInstalledItemIndent "libc++abi-dev"
DocumentInstalledItemIndent "libcurl3" DocumentInstalledItemIndent "libcurl3"
DocumentInstalledItemIndent "libicu55" DocumentInstalledItemIndent "libicu55"
DocumentInstalledItemIndent "libpython2.7"
DocumentInstalledItemIndent "libpython2.7-dev"
DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "libunwind8"
DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "locales"
DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "netcat"

View File

@@ -31,12 +31,6 @@ apt-get install -y --no-install-recommends jq
echo "Install libcurl3" echo "Install libcurl3"
apt-get install -y --no-install-recommends 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" echo "Install libunwind8"
apt-get install -y --no-install-recommends libunwind8 apt-get install -y --no-install-recommends libunwind8
@@ -154,8 +148,6 @@ DocumentInstalledItemIndent "iputils-ping"
DocumentInstalledItemIndent "jq" DocumentInstalledItemIndent "jq"
DocumentInstalledItemIndent "libcurl3" DocumentInstalledItemIndent "libcurl3"
DocumentInstalledItemIndent "libicu55" DocumentInstalledItemIndent "libicu55"
DocumentInstalledItemIndent "libpython2.7"
DocumentInstalledItemIndent "libpython2.7-dev"
DocumentInstalledItemIndent "libunwind8" DocumentInstalledItemIndent "libunwind8"
DocumentInstalledItemIndent "locales" DocumentInstalledItemIndent "locales"
DocumentInstalledItemIndent "netcat" DocumentInstalledItemIndent "netcat"

View File

@@ -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 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 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" SWIFT_PATH="/usr/share/swift/usr/bin"
sudo ln -s "$SWIFT_DIR" /usr/local/bin/swift ln -s "$SWIFT_BIN" /usr/local/bin/swift
echo "SWIFT_PATH =$SWIFT_PATH" | sudo tee -a /etc/environment echo "SWIFT_PATH=$SWIFT_PATH" | tee -a /etc/environment
# Run tests to determine that the software installed as expected # Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work" echo "Testing to make sure that script performed as expected, and basic scenarios work"