From 07e1f37d74c5d851e0cff66d52d35323d8007644 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Tue, 24 Mar 2020 09:27:15 +0300
Subject: [PATCH 01/10] added swift support

---
 images/linux/scripts/installers/1604/basic.sh |  2 ++
 images/linux/scripts/installers/swift.sh      | 24 +++++++++++++++++++
 images/linux/ubuntu1604.json                  |  1 +
 images/linux/ubuntu1804.json                  |  1 +
 4 files changed, 28 insertions(+)
 create mode 100644 images/linux/scripts/installers/swift.sh

diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh
index adc1e809..6f358be1 100644
--- a/images/linux/scripts/installers/1604/basic.sh
+++ b/images/linux/scripts/installers/1604/basic.sh
@@ -23,6 +23,8 @@ apt-fast install -y --no-install-recommends \
     libc++abi-dev \
     libcurl3 \
     libicu55 \
+    libpython2.7 \
+    libpython2.7-dev \
     libunwind8 \
     locales \
     netcat \
diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
new file mode 100644
index 00000000..23dd0d06
--- /dev/null
+++ b/images/linux/scripts/installers/swift.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+################################################################################
+##  File:  swift.sh
+##  Desc:  Installs Swift
+################################################################################
+
+# 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
+
+# Run tests to determine that the software installed as expected
+echo "Testing to make sure that script performed as expected, and basic scenarios work"
+if ! command -v swift; then
+    echo "Swift was not installed"
+    exit 1
+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
diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index e604b058..78a0d804 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -144,6 +144,7 @@
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",
                 "{{template_dir}}/scripts/installers/clang.sh",
+                "{{template_dir}}/scripts/installers/swift.sh",
                 "{{template_dir}}/scripts/installers/cmake.sh",
                 "{{template_dir}}/scripts/installers/docker-compose.sh",
                 "{{template_dir}}/scripts/installers/docker-moby.sh",
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index 6396229d..70ab724a 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -147,6 +147,7 @@
                 "{{template_dir}}/scripts/installers/aws.sh",
                 "{{template_dir}}/scripts/installers/build-essential.sh",
                 "{{template_dir}}/scripts/installers/clang.sh",
+                "{{template_dir}}/scripts/installers/swift.sh",
                 "{{template_dir}}/scripts/installers/cmake.sh",
                 "{{template_dir}}/scripts/installers/docker-compose.sh",
                 "{{template_dir}}/scripts/installers/docker-moby.sh",

From 94b6445f8c01f7f0b42cd39af3b749a82064bf42 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Tue, 24 Mar 2020 09:35:39 +0300
Subject: [PATCH 02/10] updated basic.sh for both images

---
 images/linux/scripts/installers/1604/basic.sh | 2 ++
 images/linux/scripts/installers/1804/basic.sh | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh
index 6f358be1..6a629e4f 100644
--- a/images/linux/scripts/installers/1604/basic.sh
+++ b/images/linux/scripts/installers/1604/basic.sh
@@ -83,6 +83,8 @@ 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 c12c7a81..84f3790f 100644
--- a/images/linux/scripts/installers/1804/basic.sh
+++ b/images/linux/scripts/installers/1804/basic.sh
@@ -31,6 +31,12 @@ 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
 
@@ -148,6 +154,8 @@ DocumentInstalledItemIndent "iputils-ping"
 DocumentInstalledItemIndent "jq"
 DocumentInstalledItemIndent "libcurl3"
 DocumentInstalledItemIndent "libicu55"
+DocumentInstalledItemIndent "libpython2.7"
+DocumentInstalledItemIndent "libpython2.7-dev"
 DocumentInstalledItemIndent "libunwind8"
 DocumentInstalledItemIndent "locales"
 DocumentInstalledItemIndent "netcat"

From 0903a6eaf2e5cc11d2e5a250c4a5aaa929681145 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Tue, 24 Mar 2020 15:56:42 +0300
Subject: [PATCH 03/10] fixed swift.sh

---
 images/linux/scripts/installers/swift.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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)"

From 6f557cf84c63e90096c537071144c830c931ca0c Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Tue, 24 Mar 2020 16:28:01 +0300
Subject: [PATCH 04/10] removed unused libs and fixed swift.sh

---
 images/linux/scripts/installers/1604/basic.sh | 4 ----
 images/linux/scripts/installers/1804/basic.sh | 8 --------
 images/linux/scripts/installers/swift.sh      | 8 ++++----
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/images/linux/scripts/installers/1604/basic.sh b/images/linux/scripts/installers/1604/basic.sh
index 6a629e4f..adc1e809 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 84f3790f..c12c7a81 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 103e9286..36c70571 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"

From 80399e072af74b60dc9caf68015733de87006c7a Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Wed, 25 Mar 2020 09:26:22 +0300
Subject: [PATCH 05/10] resolve comment

---
 images/linux/scripts/installers/swift.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
index 36c70571..a391444e 100644
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -12,8 +12,8 @@ wget -P /tmp https://swift.org/builds/swift-$swift_version-release/ubuntu${image
 tar xzf /tmp/swift-$swift_version-RELEASE-ubuntu$image_label.tar.gz
 mv swift-$swift_version-RELEASE-ubuntu$image_label /usr/share/swift
 
-SWIFT_BIN="/usr/share/swift/usr/bin/swift"
 SWIFT_PATH="/usr/share/swift/usr/bin"
+SWIFT_BIN="$SWIFT_PATH/swift"
 ln -s "$SWIFT_BIN" /usr/local/bin/swift
 echo "SWIFT_PATH=$SWIFT_PATH" | tee -a /etc/environment
 

From 09dd3401fe893f6058c1e4f39fd8ccdba06cd7e0 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Wed, 25 Mar 2020 11:25:36 +0300
Subject: [PATCH 06/10] added document.sh

---
 images/linux/scripts/installers/swift.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
index a391444e..36e30e85 100644
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -4,6 +4,9 @@
 ##  Desc:  Installs Swift
 ################################################################################
 
+# Source the helpers for use with the script
+source $HELPER_SCRIPTS/document.sh
+
 # Install # Install
 image_label="$(lsb_release -rs)"
 swift_version="5.1.5"

From 01d87333d87803cd5ef7c61c675aba2c6e288452 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Fri, 27 Mar 2020 09:04:35 +0300
Subject: [PATCH 07/10] updated the swift version

---
 images/linux/scripts/installers/swift.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
index 36e30e85..46f12378 100644
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/document.sh
 
 # Install # Install
 image_label="$(lsb_release -rs)"
-swift_version="5.1.5"
+swift_version="5.2"
 
 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

From 8bf9b153163fcfbf1cd46c69bc8317c6304c5e37 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Fri, 27 Mar 2020 13:55:47 +0300
Subject: [PATCH 08/10] added getting the latest version by default

---
 images/linux/scripts/installers/swift.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
index 46f12378..10777913 100644
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -7,9 +7,11 @@
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/document.sh
 
-# Install # Install
+# Install
 image_label="$(lsb_release -rs)"
-swift_version="5.2"
+
+curl https://swift.org/download/ > /tmp/tmp_file
+swift_version=$(cat /tmp/tmp_file | grep -m1 "id=\"swift-" | cut -d'>' -f2 | cut -d'<' -f1 | cut -d' ' -f2)
 
 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

From 47dfa3537548353768f2dc6ef95f4e44ce50d167 Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Fri, 27 Mar 2020 14:12:53 +0300
Subject: [PATCH 09/10] fixed getting the swift version

---
 images/linux/scripts/installers/swift.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
index 10777913..abfbacfb 100644
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -9,9 +9,7 @@ source $HELPER_SCRIPTS/document.sh
 
 # Install
 image_label="$(lsb_release -rs)"
-
-curl https://swift.org/download/ > /tmp/tmp_file
-swift_version=$(cat /tmp/tmp_file | grep -m1 "id=\"swift-" | cut -d'>' -f2 | cut -d'<' -f1 | cut -d' ' -f2)
+swift_version=$(curl https://swift.org/download/ | grep -m1 "id=\"swift-" | cut -d'>' -f2 | cut -d'<' -f1 | cut -d' ' -f2)
 
 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
@@ -31,4 +29,4 @@ fi
 
 # Document what was added to the image
 echo "Lastly, documenting what we added to the metadata file"
-DocumentInstalledItem "$(swift --version)"
+DocumentInstalledItem "$(swift --version)"
\ No newline at end of file

From db9a568512f708ad33277f2a13df544e775eb68e Mon Sep 17 00:00:00 2001
From: Nikita Bykov <v-nibyko@microsoft.com>
Date: Fri, 27 Mar 2020 14:52:12 +0300
Subject: [PATCH 10/10] updated swift_version

---
 images/linux/scripts/installers/swift.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/linux/scripts/installers/swift.sh b/images/linux/scripts/installers/swift.sh
index abfbacfb..ca97606e 100644
--- a/images/linux/scripts/installers/swift.sh
+++ b/images/linux/scripts/installers/swift.sh
@@ -9,7 +9,7 @@ source $HELPER_SCRIPTS/document.sh
 
 # Install
 image_label="$(lsb_release -rs)"
-swift_version=$(curl https://swift.org/download/ | grep -m1 "id=\"swift-" | cut -d'>' -f2 | cut -d'<' -f1 | cut -d' ' -f2)
+swift_version=$(curl -s https://swift.org/download/ | grep -m1 "id=\"swift-" | awk -F"[ <]" '{print $4}')
 
 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