From b0b1043aa1ba23e3b18b49cebcbe3655743cdaad Mon Sep 17 00:00:00 2001 From: Patrick Freed Date: Sun, 20 Aug 2023 16:28:58 -0400 Subject: [PATCH 01/11] 0.1.0 release of swiftly-install.sh --- swiftly-install.sh | 480 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 480 insertions(+) create mode 100755 swiftly-install.sh diff --git a/swiftly-install.sh b/swiftly-install.sh new file mode 100755 index 00000000..9e97c990 --- /dev/null +++ b/swiftly-install.sh @@ -0,0 +1,480 @@ +#!/usr/bin/env bash + +# swiftly-install +# Script used to install and configure swiftly. +# +# This script will download the latest released swiftly executable and install it +# to $SWIFTLY_BIN_DIR, or ~/.local/bin if that variable isn't specified. +# +# This script will also create a directory at $SWIFTLY_HOME_DIR, or +# $XDG_DATA_HOME/swiftly if that variable isn't specified. If XDG_DATA_HOME is also unset, +# ~/.local/share/swiftly will be used as a default instead. swiftly will use this directory +# to store platform information, downloaded toolchains, and other state required to manage +# the toolchains. +# +# After installation, the script will create $SWIFTLY_HOME_DIR/env.sh, which can be sourced +# to properly set up the environment variables required to run swiftly. Unless --no-modify-profile +# was specified, the script will also update ~/.profile, ~/.bash_profile, ~/.bash_login, or ~/.zprofile, +# depending on the value of $SHELL and the existence of the files, to source the env.sh file on login. +# This will ensure that future logins will automatically configure SWIFTLY_HOME_DIR, SWIFTLY_BIN_DIR, +# and PATH. +# +# Unless the --disable-confirmation flag is set, this script will allow the runner to +# configure either of those two directory paths. +# +# Unless the --no-install-system-deps flag is set, this script will attempt to install Swift's +# system dependencies using the system package manager. +# +# curl is required to run this script. + +set -o errexit +shopt -s extglob + +has_command () { + command -v "$1" > /dev/null +} + +read_input_with_default () { + echo -n "> " + # The installer script is usually run by "curl ... | bash", which means that + # stdin is not a tty but the script content itself. In that case, "read" builtin + # command receives EOF immediately. To avoid that, we use /dev/tty as stdin explicitly. + # SWIFTLY_READ_FROM_STDIN is used for testing interactive input + if [[ -t 0 ]] || [[ ${SWIFTLY_READ_FROM_STDIN+set} == "set" ]]; then + read READ_INPUT_RETURN + else + read READ_INPUT_RETURN < /dev/tty + fi + + if [ -z "$READ_INPUT_RETURN" ]; then + READ_INPUT_RETURN="$1" + fi +} + +yn_prompt () { + if [[ "$1" == "true" ]]; then + echo "(Y/n)" + else + echo "(y/N)" + fi +} + +# Read a y/n input. +# First argument is the default value (must be "true" or "false"). +# +# Sets READ_INPUT_RETURN to "true" for an input of "y" or "Y", "false" for an input +# of "n" or "N", or the default value for a blank input +# +# For all other inputs, a message is printed and the user is prompted again. +read_yn_input () { + while [[ true ]]; do + read_input_with_default "$1" + + case "$READ_INPUT_RETURN" in + "y" | "Y") + READ_INPUT_RETURN="true" + return + ;; + + "n" | "N") + READ_INPUT_RETURN="false" + return + ;; + + "$1") + return + ;; + + *) + echo "Please input either \"y\" or \"n\", or press ENTER to use the default." + ;; + esac + done +} + +# Replaces the actual path to $HOME at the beginning of the provided string argument with +# the string "$HOME". This is used when printing to stdout. +# e.g. "home/user/.local/bin" => "$HOME/.local/bin" +replace_home_path () { + if [[ "$1" =~ ^"$HOME"(/|$) ]]; then + echo "\$HOME${1#$HOME}" + else + echo "$1" + fi +} + +# Replaces the string "$HOME" or "~" in the argument with the actual value of $HOME. +# e.g. "$HOME/.local/bin" => "/home/user/.local/bin" +# e.g. "~/.local/bin" => "/home/user/.local/bin" +expand_home_path () { + echo "${1/#@(~|\$HOME)/$HOME}" +} + +# Prints the provided argument using the terminal's bold text effect. +bold () { + echo "$(tput bold)$1$(tput sgr0)" +} + +# Fetch the list of required system dependencies from the apple/swift-docker +# repository and attempt to install them using the system's package manager. +# +# $docker_platform_name, $docker_platform_version, and $package manager need +# to be set before calling this function. +install_system_deps () { + if [[ "$(id --user)" != "0" ]] && ! has_command sudo ; then + echo "Warning: sudo not installed and current user is not root, skipping system dependency installation." + return + elif ! has_command "$package_manager" ; then + echo "Warning: package manager \"$package_manager\" not found, skipping system dependency installation." + return + fi + + dockerfile_url="https://raw.githubusercontent.com/apple/swift-docker/main/nightly-main/$docker_platform_name/$docker_platform_version/Dockerfile" + dockerfile="$(curl --silent --retry 3 --location --fail $dockerfile_url)" + if [[ "$?" -ne 0 ]]; then + echo "Error enumerating system dependencies, skipping installation of system dependencies." + fi + + # Find the line number of the RUN command associated with installing system dependencies. + beg_line_num=$(printf "$dockerfile" | grep -n --max-count=1 "$package_manager.*install" | cut -d ":" -f1) + + # Starting from there, find the first line that starts with an & or doesn't end in a backslash. + relative_end_line_num=$(printf "$dockerfile" | + tail --lines=+"$((beg_line_num + 1))" | + grep -n --max-count=1 --invert-match '[[:space:]]*[^&].*\\$' | cut -d ":" -f1) + end_line_num=$((beg_line_num + relative_end_line_num)) + + # Read the lines between those two, deleting any spaces and backslashes. + readarray -t package_list < <(printf "$dockerfile" | sed -n "$((beg_line_num + 1)),${end_line_num}p" | sed -r 's/[\ ]//g') + + # If the installation command from the Dockerfile included some cleanup as part of a second command, drop that. + if [[ "${package_list[-1]}" =~ ^\&\& ]]; then + unset 'package_list[-1]' + fi + + install_args=(--quiet) + if [[ "$DISABLE_CONFIRMATION" == "true" ]]; then + install_args+=(-y) + fi + + # Disable errexit since failing to install system dependencies is not swiftly installation-fatal. + set +o errexit + if [[ "$(id --user)" == "0" ]]; then + "$package_manager" install "${install_args[@]}" "${package_list[@]}" + else + sudo "$package_manager" install "${install_args[@]}" "${package_list[@]}" + fi + if [[ "$?" -ne 0 ]]; then + echo "System dependency installation failed." + if [[ "$package_manager" == "apt-get" ]]; then + echo "You may need to run apt-get update before installing system dependencies." + fi + fi + set -o errexit +} + +SWIFTLY_INSTALL_VERSION="0.1.0" + +MODIFY_PROFILE="true" +SWIFTLY_INSTALL_SYSTEM_DEPS="true" + +for arg in "$@"; do + case "$arg" in + "--help" | "-h") + cat < "$HOME_DIR/config.json" + +# Verify the downloaded executable works. The script will exit if this fails due to errexit. +SWIFTLY_HOME_DIR="$HOME_DIR" SWIFTLY_BIN_DIR="$BIN_DIR" "$BIN_DIR/swiftly" --version > /dev/null + +ENV_OUT=$(cat < "$HOME_DIR/env.sh" + +if [[ "$MODIFY_PROFILE" == "true" ]]; then + SOURCE_LINE=". $(replace_home_path $HOME_DIR)/env.sh" + + # Only append the line if it isn't in .profile already. + if [[ ! -f "$PROFILE_FILE" ]] || [[ ! "$(cat $PROFILE_FILE)" =~ "$SOURCE_LINE" ]]; then + echo "$SOURCE_LINE" >> "$PROFILE_FILE" + fi +fi + +if [[ "$SWIFTLY_INSTALL_SYSTEM_DEPS" != "false" ]]; then + echo "" + echo "Installing Swift's system dependencies via $package_manager (note: this may require root access)..." + install_system_deps +fi + +echo "" +echo "swiftly has been succesfully installed!" +echo "" + +if ! has_command "swiftly" || [[ "$HOME_DIR" != "$DEFAULT_HOME_DIR" || "$BIN_DIR" != "$DEFAULT_BIN_DIR" ]] ; then + echo "Once you log in again, swiftly should be accessible from your PATH." + echo "To begin using swiftly from your current shell, first run the following command:" + echo "" + echo " . $(replace_home_path $HOME_DIR)/env.sh" + echo "" + echo "Then to install the latest version of Swift, run 'swiftly install latest'" +else + echo "To install the latest version of Swift, run 'swiftly install latest'" +fi From 7cc491d67f501bccf6cf574feaa68b28fcd47feb Mon Sep 17 00:00:00 2001 From: Patrick Freed Date: Sun, 20 Aug 2023 22:24:01 -0400 Subject: [PATCH 02/11] cherry-pick system dep installation confirmation changes (0.1.0) --- swiftly-install.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/swiftly-install.sh b/swiftly-install.sh index 9e97c990..d2eb3a32 100755 --- a/swiftly-install.sh +++ b/swiftly-install.sh @@ -152,10 +152,7 @@ install_system_deps () { unset 'package_list[-1]' fi - install_args=(--quiet) - if [[ "$DISABLE_CONFIRMATION" == "true" ]]; then - install_args+=(-y) - fi + install_args=(--quiet -y) # Disable errexit since failing to install system dependencies is not swiftly installation-fatal. set +o errexit @@ -250,6 +247,7 @@ case "$ID" in "ubuntu") docker_platform_name="ubuntu" package_manager="apt-get" + export DEBIAN_FRONTEND=noninteractive case "$UBUNTU_CODENAME" in "jammy") PLATFORM_NAME="ubuntu2204" From da28053f0144346ed9e56954b4fa16f59ad2c4b4 Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Fri, 25 Aug 2023 22:18:23 +0100 Subject: [PATCH 03/11] Add installation website (#57) --- css/font.css | 32 +++++++++++++++ favicon.ico | Bin 0 -> 34494 bytes images/swift_logo_color.png | Bin 0 -> 10719 bytes index.html | 78 ++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 css/font.css create mode 100644 favicon.ico create mode 100644 images/swift_logo_color.png create mode 100644 index.html diff --git a/css/font.css b/css/font.css new file mode 100644 index 00000000..ffd70fc1 --- /dev/null +++ b/css/font.css @@ -0,0 +1,32 @@ +body { + font-family: -apple-system, BlinkMacSystemFont, "SF Hello", "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif; + font-size: 18px; + line-height: 1.5; + font-weight: 300; + + pre, code { + font-family: "SF Mono", Menlo, Consolas, Monaco, "Courier New", monospace, serif; + } +} + +.terminal { + white-space: nowrap; + overflow: scroll; +} + +.left { + display: inline-block; + max-width: calc(100% - 60px); +} +.right { + display: inline-block; + max-width: 50px; +} +#copy-button:active { + color: #888; +} +#gh-link { + display:flex; + align-items:center; + justify-content:center; +} \ No newline at end of file diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..51b4365a98a8842151d14a36a27abc93c3cc6fc4 GIT binary patch literal 34494 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 literal 0 HcmV?d00001 diff --git a/images/swift_logo_color.png b/images/swift_logo_color.png new file mode 100644 index 0000000000000000000000000000000000000000..8fb8d9cdacda36a372943803e1d2d5cfde058024 GIT binary patch literal 10719 zcmch7bzGEd*Y40A(nt+4^w2E~jdYAO0?xn?5<_=`fOLlf(jrPpDAJuuDIwAzAxMfe z2Xwo)@Ba3CzW02;a}NBTdG1;Fy4G6vTGv|7^T#~Y*1S!CdlMG`01&7sD?qRAme&_H z=GCXuVyf=d4aF6DTMkhEj&}X(%V&h4ij{^2fb(jN4ZuVp0ia#0T>S%3ZUQiVtN{Rh z6q-NRW+?ms)GImT)n$bu@MBGOwT_Ii1)%?-pLKP=UUFZ5{JP6pBH;+2whht^>1u;? z0tyK6hyd9&U>3HH*Afl@K!8s`P=ZfXLO>A6&o3b;Cc!5H0H7zJ|LJ2i7v-<`a#8>E zXPJxk*ZSJC03W}w1iyd;pE!_TT!N2ZLO={qZ9dR^wT0uPY~%_6@GxIrC|*U<9smF? zgRQQio1uofgay)p2X-AOkC%hfwIzV0m&Dc50pSJ%dO6rTx=MISG5yexxLRL}d6|Ge zRNU;Om<%dHDo*1q8rX8ems%M>m)k*wK~wr;%TF6cDZ!F1Ai?wn#_dwOtq->Fy@Q z#B}ZG&%d8>T3Y<+$I0Er{)ZP!3togh!U5sv=E}>@!_WIqxU19t33PP*BO6zF;q`(! zU4i)i9Y{mte-CqT_(!Cxo1(|n3I52)KRR^P^>#w=LJ_V=cNYtUqQ_PE%>NX*o2}Jf zx&0SQ*E|04+EyiShRlDvNj|0;^) zRZ=B1ke0Sq-U=``1mv3OU_Mc>fS~R#rgL4fl#fr6_ivhivmx(-fVm-EbdgAV$bZ*R zKW+Vv_$OnCKLX+x2J;Jm`NVa9HH`6Z_@7FDgKJ!o-xB5q`;SiayY9c*(a?}kwspNa zl=p9`y-M(pzPW>N{#WU*4SU-k{C9%6xFW9UA;t8IAAdH?pZ#!+`9U)YSEQAjC(H#Q zYkkF`{~&??g!(J`KOOvG-O~o)cvaee%H&T&KNS8w-qz984d!TpP*H$fv4F?c)>1-5 zRKx;dVI=~#vJw^s3t0(Sg2e^kR$xnED;Qi*RGikq62kkdioXPZKiXe8{DYzY zcKG~HX$luWi0}!E!N3SO3=S6JvxI@+BK$D00NhfXA0aL-VkL4l+WyaJ>I(DtACmMZ zb^mpI{1|BeIBu@z^VNoyi>Qu(h# zn^SlOw;qQvH~7Kc!bMY!KY5{Qi3RgWzhSM^XR) z^wug0vbtU^Ef@7pCt1K#g&N8OdC`*rIbev7+ZhAb)FGm@RdR-DN zK3~56EdJF7CnqY?o8I>RHBw??Q*tu VB4Z>W}mLDOZ6p76nPPUhF(mAA*uUpLC% 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 + + + + + Codestin Search App + + + + + +
+
+ +

swiftly

+

+ A Swift toolchain installer and manager, written in Swift. +

+
+
+
+
+
+ To install swiftly, run the following command in your terminal. +
+
+
+
+ $ curl -L https://swift-server.github.io/swiftly/swiftly-install.sh | bash +
+ +
+
+
+
+
+
+
+
+

+ Swiftly is a Swift Server Working Group project. +

+ + + +
+
+
+ + + + + + + + + + + + + + From e7f58d892d40d2b13dab1676fce0a16356f915e4 Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Thu, 31 Aug 2023 18:19:04 +0100 Subject: [PATCH 04/11] Add only available for Linux text (#59) --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index f9fdd1d0..18f6fadf 100644 --- a/index.html +++ b/index.html @@ -34,6 +34,7 @@

swiftly

+

Swiftly is currently only available for Linux.

From 623631c47261d44aa4f82e6fbfaa9e32ad1dd8f0 Mon Sep 17 00:00:00 2001 From: Patrick Freed Date: Sat, 23 Sep 2023 20:09:29 -0400 Subject: [PATCH 05/11] Deploy swiftly-install 0.2.0 This includes support for auto-detecting derived platforms (e.g. Linux Mint) and for allowing users to manually specify the platform they want to download toolchains from, either interactively if a platform cannot be detected or manually via a command line option. --- swiftly-install.sh | 307 ++++++++++++++++++++++++++++++++------------- 1 file changed, 221 insertions(+), 86 deletions(-) diff --git a/swiftly-install.sh b/swiftly-install.sh index d2eb3a32..086047bb 100755 --- a/swiftly-install.sh +++ b/swiftly-install.sh @@ -25,10 +25,7 @@ # Unless the --no-install-system-deps flag is set, this script will attempt to install Swift's # system dependencies using the system package manager. # -# curl is required to run this script. - -set -o errexit -shopt -s extglob +# curl and getopt (from the util-linux package) are required to run this script. has_command () { command -v "$1" > /dev/null @@ -170,26 +167,198 @@ install_system_deps () { set -o errexit } -SWIFTLY_INSTALL_VERSION="0.1.0" +set_platform_ubuntu () { + docker_platform_name="ubuntu" + package_manager="apt-get" + export DEBIAN_FRONTEND=noninteractive + + PLATFORM_NAME="ubuntu$1$2" + PLATFORM_NAME_FULL="ubuntu$1.$2" + docker_platform_version="$1.$2" + + if [[ -z "$PLATFORM_NAME_PRETTY" ]]; then + PLATFORM_NAME_PRETTY="Ubuntu $1.$2" + fi +} + +set_platform_amazonlinux () { + PLATFORM_NAME="amazonlinux$1" + PLATFORM_NAME_FULL="amazonlinux$1" + docker_platform_name="amazonlinux" + docker_platform_version="$1" + package_manager="yum" + + if [[ -z "$PLATFORM_NAME_PRETTY" ]]; then + PLATFORM_NAME_PRETTY="Amazon Linux $1" + fi +} + +set_platform_rhel () { + PLATFORM_NAME="ubi$1" + PLATFORM_NAME_FULL="ubi$1" + docker_platform_name="rhel-ubi" + docker_platform_version="$1" + package_manager="yum" + + if [[ -z "$PLATFORM_NAME_PRETTY" ]]; then + PLATFORM_NAME_PRETTY="RHEL 9" + fi +} + +detect_platform () { + if [[ -f "/etc/os-release" ]]; then + OS_RELEASE="/etc/os-release" + elif [[ -f "/usr/lib/os-release" ]]; then + OS_RELEASE="/usr/lib/os-release" + else + manually_select_platform + fi + + source "$OS_RELEASE" + PLATFORM_NAME_PRETTY="$PRETTY_NAME" + + case "$ID$ID_LIKE" in + *"amzn"*) + if [[ "$VERSION_ID" != "2" ]]; then + manually_select_platform + else + set_platform_amazonlinux "2" + fi + ;; + + *"ubuntu"*) + case "$UBUNTU_CODENAME" in + "jammy") + set_platform_ubuntu "22" "04" + ;; + + "focal") + set_platform_ubuntu "20" "04" + ;; + + "bionic") + set_platform_ubuntu "18" "04" + ;; + + *) + manually_select_platform + ;; + esac + ;; + + *"rhel"*) + if [[ "$VERSION_ID" != 9* ]]; then + manually_select_platform + else + set_platform_rhel "9" + fi + ;; + + *) + manually_select_platform + ;; + esac +} + +manually_select_platform () { + if [[ "$DISABLE_CONFIRMATION" == "true" ]]; then + echo "Error: Unsupported platform: $PRETTY_NAME" + exit 1 + fi + echo "$PLATFORM_NAME_PRETTY is not an officially supported platform, but the toolchains for another platform may still work on it." + echo "" + echo "Please select the platform to use for toolchain downloads:" + + echo "0) Cancel" + echo "1) Ubuntu 22.04" + echo "2) Ubuntu 20.04" + echo "3) Ubuntu 18.04" + echo "4) RHEL 9" + echo "5) Amazon Linux 2" + + read_input_with_default "0" + case "$READ_INPUT_RETURN" in + "1" | "1)") + set_platform_ubuntu "22" "04" + ;; + + "2" | "2)") + set_platform_ubuntu "20" "04" + ;; + + "3" | "3)") + set_platform_ubuntu "18" "04" + ;; + + "4" | "4)") + set_platform_rhel "9" + ;; + + "5" | "5)") + set_platform_amazonlinux "2" + ;; + + *) + echo "Cancelling installation." + exit 0 + ;; + esac +} + +verify_getopt_install () { + if ! has_command "getopt" ; then + return 1 + fi + + getopt --test + # getopt --test exiting with status code 4 implies getopt from util-linux is being used, which we need. + [[ "$?" -eq 4 ]] + return "$?" +} + +SWIFTLY_INSTALL_VERSION="0.2.0" MODIFY_PROFILE="true" SWIFTLY_INSTALL_SYSTEM_DEPS="true" -for arg in "$@"; do - case "$arg" in +if ! has_command "curl" ; then + echo "Error: curl must be installed to download swiftly" + exit 1 +fi + +if ! verify_getopt_install ; then + echo "Error: getopt must be installed from the util-linux package to run swiftly-install" + exit 1 +fi + +set -o errexit +shopt -s extglob + +short_options='yhvp:' +long_options='disable-confirmation,no-modify-profile,no-install-system-deps,help,version,platform:' + +args=$(getopt --options "$short_options" --longoptions "$long_options" --name "swiftly-install" -- "${@}") +eval "set -- ${args}" + +while [ true ]; do + case "$1" in "--help" | "-h") cat < Specifies which platform's toolchains swiftly will download. If + unspecified, the platform will be automatically detected. Available + options are "ubuntu22.04", "ubuntu20.04", "ubuntu18.04", "rhel9", and + "amazonlinux2". -h, --help Prints help information. --version Prints version information. EOF @@ -198,14 +367,17 @@ EOF "--disable-confirmation" | "-y") DISABLE_CONFIRMATION="true" + shift ;; "--no-modify-profile") MODIFY_PROFILE="false" + shift ;; "--no-install-system-deps") SWIFTLY_INSTALL_SYSTEM_DEPS="false" + shift ;; "--version") @@ -213,85 +385,52 @@ EOF exit 0 ;; + "--platform" | "-p") + case "$2" in + "ubuntu22.04") + set_platform_ubuntu "22" "04" + ;; + + "ubuntu20.04") + set_platform_ubuntu "20" "04" + ;; + + "ubuntu18.04") + set_platform_ubuntu "18" "04" + ;; + + "amazonlinux2") + set_platform_amazonlinux "2" + ;; + + "rhel9") + set_platform_rhel "9" + ;; + + *) + echo "Error: unrecognized platform $2" + exit 1 + ;; + esac + shift 2 + ;; + + --) + shift + break + ;; + *) - echo "Error: unrecognized flag \"$arg\"" + echo "Error: unrecognized option \"$arg\"" exit 1 ;; esac done -if [[ -f "/etc/os-release" ]]; then - OS_RELEASE="/etc/os-release" -elif [[ -f "/usr/lib/os-release" ]]; then - OS_RELEASE="/usr/lib/os-release" -else - echo "Error: could not detect OS information" - exit 1 +if [[ -z "$PLATFORM_NAME" ]]; then + detect_platform fi -source "$OS_RELEASE" - -case "$ID" in - "amzn") - if [[ "$VERSION_ID" != "2" ]]; then - echo "Error: Unsupported Amazon Linux version: $PRETTY_NAME" - exit 1 - fi - PLATFORM_NAME="amazonlinux2" - PLATFORM_NAME_FULL="amazonlinux2" - docker_platform_name="amazonlinux" - docker_platform_version="2" - package_manager="yum" - ;; - - "ubuntu") - docker_platform_name="ubuntu" - package_manager="apt-get" - export DEBIAN_FRONTEND=noninteractive - case "$UBUNTU_CODENAME" in - "jammy") - PLATFORM_NAME="ubuntu2204" - PLATFORM_NAME_FULL="ubuntu22.04" - docker_platform_version="22.04" - ;; - - "focal") - PLATFORM_NAME="ubuntu2004" - PLATFORM_NAME_FULL="ubuntu20.04" - docker_platform_version="20.04" - ;; - - "bionic") - PLATFORM_NAME="ubuntu1804" - PLATFORM_NAME_FULL="ubuntu18.04" - docker_platform_version="18.04" - ;; - - *) - echo "Error: Unsupported Ubuntu version: $PRETTY_NAME" - exit 1 - ;; - esac - ;; - - "rhel") - if [[ "$VERSION_ID" != 9* ]]; then - echo "Error: Unsupported RHEL version: $PRETTY_NAME" - exit 1 - fi - PLATFORM_NAME="ubi9" - PLATFORM_NAME_FULL="ubi9" - docker_platform_name="rhel-ubi" - docker_platform_version="9" - package_manager="yum" - ;; - - *) - echo "Error: Unsupported platform: $PRETTY_NAME" - exit 1 - ;; -esac - RAW_ARCH="$(uname -m)" case "$RAW_ARCH" in "x86_64") @@ -306,20 +445,16 @@ case "$RAW_ARCH" in *) echo "Error: Unsupported CPU architecture: $RAW_ARCH" + exit 1 ;; esac -if ! has_command "curl" ; then - echo "Error: curl must be installed to download swiftly" - exit 1 -fi - JSON_OUT=$(cat < Date: Mon, 25 Dec 2023 14:14:00 -0500 Subject: [PATCH 06/11] Deploy swiftly-install 0.3.0 This release modifies swiftly-install's default behavior when encountering an existing installation of swiftly to updating only the swiftly binary rather than performing a clean installation, which was the previous default. The previous behavior can be achived by passing in the --overwrite flag. This release also fixes a bug where swiftly-install would not clean up any existing symlinks when overwriting an existing swiftly installation. --- swiftly-install.sh | 66 +++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/swiftly-install.sh b/swiftly-install.sh index 086047bb..6df8285f 100755 --- a/swiftly-install.sh +++ b/swiftly-install.sh @@ -316,7 +316,7 @@ verify_getopt_install () { return "$?" } -SWIFTLY_INSTALL_VERSION="0.2.0" +SWIFTLY_INSTALL_VERSION="0.3.0" MODIFY_PROFILE="true" SWIFTLY_INSTALL_SYSTEM_DEPS="true" @@ -335,7 +335,7 @@ set -o errexit shopt -s extglob short_options='yhvp:' -long_options='disable-confirmation,no-modify-profile,no-install-system-deps,help,version,platform:' +long_options='disable-confirmation,no-modify-profile,no-install-system-deps,help,version,platform:,overwrite' args=$(getopt --options "$short_options" --longoptions "$long_options" --name "swiftly-install" -- "${@}") eval "set -- ${args}" @@ -351,7 +351,7 @@ USAGE: swiftly-install [options] OPTIONS: - -y, --disable-confirmation Disable confirmation prompt. + -y, --disable-confirmation Disable confirmation prompts. --no-modify-profile Do not attempt to modify the profile file to set environment variables (e.g. PATH) on login. --no-install-system-deps Do not attempt to install Swift's required system dependencies. @@ -359,6 +359,10 @@ OPTIONS: unspecified, the platform will be automatically detected. Available options are "ubuntu22.04", "ubuntu20.04", "ubuntu18.04", "rhel9", and "amazonlinux2". + --overwrite Overwrite the existing swiftly installation found at the configured + SWIFTLY_HOME, if any. If this option is unspecified and an existing + installation is found, the swiftly executable will be updated, but + the rest of the installation will not be modified. -h, --help Prints help information. --version Prints version information. EOF @@ -415,6 +419,11 @@ EOF shift 2 ;; + "--overwrite") + overwrite_existing_intallation="true" + shift + ;; + --) shift break @@ -534,20 +543,15 @@ while [ -z "$DISABLE_CONFIRMATION" ]; do esac done -if [[ -d "$HOME_DIR" ]]; then - if [[ "$DISABLE_CONFIRMATION" == "true" ]]; then +if [[ -f "$HOME_DIR/config.json" ]]; then + detected_existing_installation="true" + if [[ "$overwrite_existing_intallation" == "true" ]]; then echo "Overwriting existing swiftly installation at $(replace_home_path $HOME_DIR)" + find $BIN_DIR -lname "$HOME_DIR/toolchains/**/bin/*" -delete + rm -r $HOME_DIR else - echo "Existing swiftly installation detected at $(replace_home_path $HOME_DIR), overwrite? (Y/n)" - - read_yn_input "true" - if [[ "$READ_INPUT_RETURN" == "false" ]]; then - echo "Cancelling installation." - exit 0 - fi + echo "Updating existing swiftly installation at $(replace_home_path $HOME_DIR)" fi - - rm -r $HOME_DIR fi mkdir -p $HOME_DIR/toolchains @@ -566,35 +570,37 @@ curl \ chmod +x "$BIN_DIR/swiftly" -echo "$JSON_OUT" > "$HOME_DIR/config.json" +if [[ "$detected_existing_installation" != "true" || "$overwrite_existing_intallation" == "true" ]]; then + echo "$JSON_OUT" > "$HOME_DIR/config.json" -# Verify the downloaded executable works. The script will exit if this fails due to errexit. -SWIFTLY_HOME_DIR="$HOME_DIR" SWIFTLY_BIN_DIR="$BIN_DIR" "$BIN_DIR/swiftly" --version > /dev/null + # Verify the downloaded executable works. The script will exit if this fails due to errexit. + SWIFTLY_HOME_DIR="$HOME_DIR" SWIFTLY_BIN_DIR="$BIN_DIR" "$BIN_DIR/swiftly" --version > /dev/null -ENV_OUT=$(cat < "$HOME_DIR/env.sh" + echo "$ENV_OUT" > "$HOME_DIR/env.sh" -if [[ "$MODIFY_PROFILE" == "true" ]]; then - SOURCE_LINE=". $(replace_home_path $HOME_DIR)/env.sh" + if [[ "$MODIFY_PROFILE" == "true" ]]; then + SOURCE_LINE=". $(replace_home_path $HOME_DIR)/env.sh" - # Only append the line if it isn't in .profile already. - if [[ ! -f "$PROFILE_FILE" ]] || [[ ! "$(cat $PROFILE_FILE)" =~ "$SOURCE_LINE" ]]; then - echo "$SOURCE_LINE" >> "$PROFILE_FILE" + # Only append the line if it isn't in .profile already. + if [[ ! -f "$PROFILE_FILE" ]] || [[ ! "$(cat $PROFILE_FILE)" =~ "$SOURCE_LINE" ]]; then + echo "$SOURCE_LINE" >> "$PROFILE_FILE" + fi fi -fi -if [[ "$SWIFTLY_INSTALL_SYSTEM_DEPS" != "false" ]]; then - echo "" - echo "Installing Swift's system dependencies via $package_manager (note: this may require root access)..." - install_system_deps + if [[ "$SWIFTLY_INSTALL_SYSTEM_DEPS" != "false" ]]; then + echo "" + echo "Installing Swift's system dependencies via $package_manager (note: this may require root access)..." + install_system_deps + fi fi echo "" From fce2ce77e534677f1fff1b039943f7e3ae904019 Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Tue, 7 May 2024 17:09:25 +0100 Subject: [PATCH 07/11] swiftly-install v0.4.0 --- swiftly-install.sh | 94 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 20 deletions(-) diff --git a/swiftly-install.sh b/swiftly-install.sh index 6df8285f..4faf694e 100755 --- a/swiftly-install.sh +++ b/swiftly-install.sh @@ -12,10 +12,11 @@ # to store platform information, downloaded toolchains, and other state required to manage # the toolchains. # -# After installation, the script will create $SWIFTLY_HOME_DIR/env.sh, which can be sourced +# After installation, the script will create $SWIFTLY_HOME_DIR/env.{sh,fish}, which can be sourced # to properly set up the environment variables required to run swiftly. Unless --no-modify-profile -# was specified, the script will also update ~/.profile, ~/.bash_profile, ~/.bash_login, or ~/.zprofile, -# depending on the value of $SHELL and the existence of the files, to source the env.sh file on login. +# was specified, the script will also update ~/.profile, ~/.bash_profile, ~/.bash_login, ~/.zprofile, +# $XDG_CONFIG_HOME/fish/conf.d/swiftly.fish, or ~/.config/fish/conf.d/swiftly.fish depending on +# the value of $SHELL and the existence of the files, to source the env.{sh,fish} file on login. # This will ensure that future logins will automatically configure SWIFTLY_HOME_DIR, SWIFTLY_BIN_DIR, # and PATH. # @@ -149,6 +150,9 @@ install_system_deps () { unset 'package_list[-1]' fi + # Always install gpg, since swiftly itself needs it for signature verification. + package_list+=("gpg") + install_args=(--quiet -y) # Disable errexit since failing to install system dependencies is not swiftly installation-fatal. @@ -316,7 +320,7 @@ verify_getopt_install () { return "$?" } -SWIFTLY_INSTALL_VERSION="0.3.0" +SWIFTLY_INSTALL_VERSION="0.4.0" MODIFY_PROFILE="true" SWIFTLY_INSTALL_SYSTEM_DEPS="true" @@ -355,6 +359,7 @@ OPTIONS: --no-modify-profile Do not attempt to modify the profile file to set environment variables (e.g. PATH) on login. --no-install-system-deps Do not attempt to install Swift's required system dependencies. + --no-import-pgp-keys Do not attempt to import Swift's PGP keys. -p, --platform Specifies which platform's toolchains swiftly will download. If unspecified, the platform will be automatically detected. Available options are "ubuntu22.04", "ubuntu20.04", "ubuntu18.04", "rhel9", and @@ -384,6 +389,11 @@ EOF shift ;; + "--no-import-pgp-keys") + swiftly_import_pgp_keys="false" + shift + ;; + "--version") echo "$SWIFTLY_INSTALL_VERSION" exit 0 @@ -486,6 +496,15 @@ case "$SHELL" in PROFILE_FILE="$HOME/.bash_login" fi ;; + *"fish") + # $XDG_CONFIG_HOME/fish/conf.d/swiftly.fish or ~/.config/fish/conf.d/swiftly.fish + # https://github.com/fish-shell/fish-shell/issues/3170#issuecomment-228311857 + if [ -n "$XDG_CONFIG_HOME" ]; then + PROFILE_FILE="$XDG_CONFIG_HOME/fish/conf.d/swiftly.fish" + else + PROFILE_FILE="$HOME/.config/fish/conf.d/swiftly.fish" + fi + ;; *) esac @@ -570,50 +589,85 @@ curl \ chmod +x "$BIN_DIR/swiftly" -if [[ "$detected_existing_installation" != "true" || "$overwrite_existing_intallation" == "true" ]]; then - echo "$JSON_OUT" > "$HOME_DIR/config.json" - - # Verify the downloaded executable works. The script will exit if this fails due to errexit. - SWIFTLY_HOME_DIR="$HOME_DIR" SWIFTLY_BIN_DIR="$BIN_DIR" "$BIN_DIR/swiftly" --version > /dev/null - - ENV_OUT=$(cat < "$HOME_DIR/env.sh" +if [[ "$detected_existing_installation" != "true" || "$overwrite_existing_intallation" == "true" ]]; then + echo "$JSON_OUT" > "$HOME_DIR/config.json" + + # Verify the downloaded executable works. The script will exit if this fails due to errexit. + SWIFTLY_HOME_DIR="$HOME_DIR" SWIFTLY_BIN_DIR="$BIN_DIR" "$BIN_DIR/swiftly" --version > /dev/null + + echo "$ENV_OUT" > "$HOME_DIR/$ENV_FILE" if [[ "$MODIFY_PROFILE" == "true" ]]; then - SOURCE_LINE=". $(replace_home_path $HOME_DIR)/env.sh" + SOURCE_LINE=". $(replace_home_path $HOME_DIR)/$ENV_FILE" # Only append the line if it isn't in .profile already. if [[ ! -f "$PROFILE_FILE" ]] || [[ ! "$(cat $PROFILE_FILE)" =~ "$SOURCE_LINE" ]]; then echo "$SOURCE_LINE" >> "$PROFILE_FILE" fi fi +fi - if [[ "$SWIFTLY_INSTALL_SYSTEM_DEPS" != "false" ]]; then +if [[ "$SWIFTLY_INSTALL_SYSTEM_DEPS" != "false" ]]; then + echo "" + echo "Installing Swift's system dependencies via $package_manager (note: this may require root access)..." + install_system_deps +fi + +if [[ "$swiftly_import_pgp_keys" != "false" ]]; then + if has_command gpg ; then echo "" - echo "Installing Swift's system dependencies via $package_manager (note: this may require root access)..." - install_system_deps + echo "Importing Swift's PGP keys..." + curl --silent --retry 3 --location --fail https://swift.org/keys/all-keys.asc | gpg --import - + else + echo "gpg not installed, skipping import of Swift's PGP keys." fi fi echo "" -echo "swiftly has been succesfully installed!" +echo "swiftly has been successfully installed!" echo "" if ! has_command "swiftly" || [[ "$HOME_DIR" != "$DEFAULT_HOME_DIR" || "$BIN_DIR" != "$DEFAULT_BIN_DIR" ]] ; then - echo "Once you log in again, swiftly should be accessible from your PATH." + if [[ "$MODIFY_PROFILE" == "true" ]]; then + echo "Once you log in again, swiftly should be accessible from your PATH." + fi echo "To begin using swiftly from your current shell, first run the following command:" echo "" - echo " . $(replace_home_path $HOME_DIR)/env.sh" + echo " . $(replace_home_path $HOME_DIR)/$ENV_FILE" echo "" echo "Then to install the latest version of Swift, run 'swiftly install latest'" else echo "To install the latest version of Swift, run 'swiftly install latest'" fi + +if has_command "swift" ; then + echo "" + echo "Warning: existing installation of Swift detected at $(command -v swift)" + echo "To ensure swiftly-installed toolchains can be found by the shell, uninstall any existing Swift installation(s)." + echo "To ensure the current shell can find swiftly-installed toolchains, you may also need to run 'hash -r'." +fi From 7386eb9e8302d95d98896fd7859acbacb61a527f Mon Sep 17 00:00:00 2001 From: Adam Fowler Date: Tue, 11 Jun 2024 16:25:48 +0100 Subject: [PATCH 08/11] Update website --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 18f6fadf..a3c5076f 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,7 @@

swiftly


- $ curl -L https://swift-server.github.io/swiftly/swiftly-install.sh | bash + $ curl -L https://swiftlang.github.io/swiftly/swiftly-install.sh | bash
-

Swiftly is currently only available for Linux.

@@ -43,9 +45,9 @@

swiftly

- Swiftly is a Swift Server Working Group project. + swiftly is a Swift project.

- +

swiftly

- diff --git a/swiftly-install.sh b/swiftly-install.sh index 6a594916..06442dfe 100755 --- a/swiftly-install.sh +++ b/swiftly-install.sh @@ -508,7 +508,10 @@ case "$SHELL" in *) esac -echo "This script will install swiftly, a Swift toolchain installer and manager." +echo "This script will install swiftly, a Swift toolchain installer and manager version 0.3.0." +echo "" +echo "WARNING: This is an outdated version of swiftly and this installation method is deprecated." +echo " Install the newest version of swiftly by visiting https://swift.org/install" echo "" DATA_DIR="${XDG_DATA_HOME:-$HOME/.local/share}" @@ -649,7 +652,7 @@ if [[ "$swiftly_import_pgp_keys" != "false" ]]; then fi echo "" -echo "swiftly has been successfully installed!" +echo "swiftly 0.3.0 has been successfully installed!" echo "" if ! has_command "swiftly" || [[ "$HOME_DIR" != "$DEFAULT_HOME_DIR" || "$BIN_DIR" != "$DEFAULT_BIN_DIR" ]] ; then