From bc6fc8bb68f96af990e43db14bf553acda5a3e24 Mon Sep 17 00:00:00 2001 From: Sami Samhuri Date: Sun, 22 Dec 2019 14:22:30 -0800 Subject: [PATCH] Update bootstrap to install Swift on Linux --- bin/bootstrap | 29 ++++++++++++++++++----------- bin/build-gensite | 4 ++-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/bin/bootstrap b/bin/bootstrap index 8a137d8..67cfc15 100755 --- a/bin/bootstrap +++ b/bin/bootstrap @@ -1,16 +1,23 @@ -#!/bin/sh +#!/bin/bash -# bail on errors -set -e +# bail on errors and unset variables +set -euo pipefail -# export PATH="$HOME/.rbenv/shims:$PATH" +SWIFT_VERSION=5.1.3 +SWIFT_DIR=swift-$SWIFT_VERSION-RELEASE/swift-$SWIFT_VERSION-RELEASE-ubuntu18.04 +SWIFT_FILENAME=$SWIFT_DIR.tar.gz -echo "*** bootstrap samhuri.net" - -echo "* bundle install" -bundle install - -# echo "* npm install" -# npm install +if [[ $(uname) = "Linux" ]]; then + if which swiftc >/dev/null 2>/dev/null; then + echo "*** swift is installed: $(swift --version)" + else + echo "*** installing swift" + pushd $HOME + wget https://swift.org/builds/swift-$SWIFT_VERSION-release/ubuntu1804/$SWIFT_FILENAME + tar xzf $SWIFT_FILENAME + echo "export PATH=\"\$HOME/$SWIFT_DIR/usr/bin:\$PATH\"" >> $HOME/.bashrc + popd + fi +fi echo "*** done" diff --git a/bin/build-gensite b/bin/build-gensite index 9ed0da6..58e1e82 100755 --- a/bin/build-gensite +++ b/bin/build-gensite @@ -3,9 +3,9 @@ set -euo pipefail if [[ $(uname) = "Linux" ]]; then - build_platform_dir="x86_64-unknown-linux" + build_platform_dir="x86_64-unknown-linux" else - build_platform_dir="x86_64-apple-macosx" + build_platform_dir="x86_64-apple-macosx" fi pushd "gensite" >/dev/null