From 1692e2cbb5db4b069ca22190b6a45f4884ad3501 Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 13 Sep 2020 15:11:52 -0700 Subject: [PATCH] vscode/vscodium: split update scripts Split up the vscode update.sh into separate vscode/vscodium update scripts. Recently the versions of vscode and vscodium have diverged (see VSCodium/vscodium#501), meaning that the updates for one package fail while the other succeeds. This PR splits up the update scripts so that one can be run with out the other and vice-versa. --- .../vscode/{update.sh => update-vscode.sh} | 17 -------------- .../editors/vscode/update-vscodium.sh | 23 +++++++++++++++++++ 2 files changed, 23 insertions(+), 17 deletions(-) rename pkgs/applications/editors/vscode/{update.sh => update-vscode.sh} (55%) mode change 100755 => 100644 create mode 100755 pkgs/applications/editors/vscode/update-vscodium.sh diff --git a/pkgs/applications/editors/vscode/update.sh b/pkgs/applications/editors/vscode/update-vscode.sh old mode 100755 new mode 100644 similarity index 55% rename from pkgs/applications/editors/vscode/update.sh rename to pkgs/applications/editors/vscode/update-vscode.sh index c030e38a70a..5066a8e4182 --- a/pkgs/applications/editors/vscode/update.sh +++ b/pkgs/applications/editors/vscode/update-vscode.sh @@ -8,10 +8,6 @@ if [ ! -f "$ROOT/vscode.nix" ]; then echo "ERROR: cannot find vscode.nix in $ROOT" exit 1 fi -if [ ! -f "$ROOT/vscodium.nix" ]; then - echo "ERROR: cannot find vscodium.nix in $ROOT" - exit 1 -fi # VSCode @@ -26,16 +22,3 @@ sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODE_LINUX_SHA256}\"/" VSCODE_DARWIN_URL="https://vscode-update.azurewebsites.net/${VSCODE_VER}/darwin/stable" VSCODE_DARWIN_SHA256=$(nix-prefetch-url ${VSCODE_DARWIN_URL}) sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODE_DARWIN_SHA256}\"/" "$ROOT/vscode.nix" - -# VSCodium - -VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') -sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" - -VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" -VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) -sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" - -VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" -VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) -sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix" diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh new file mode 100755 index 00000000000..0e8ce6da5a0 --- /dev/null +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused gawk + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" +if [ ! -f "$ROOT/vscodium.nix" ]; then + echo "ERROR: cannot find vscodium.nix in $ROOT" + exit 1 +fi + +# VSCodium + +VSCODIUM_VER=$(curl -Ls -w %{url_effective} -o /dev/null https://github.com/VSCodium/vscodium/releases/latest | awk -F'/' '{print $NF}') +sed -i "s/version = \".*\"/version = \"${VSCODIUM_VER}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_LINUX_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-linux-x64-${VSCODIUM_VER}.tar.gz" +VSCODIUM_LINUX_SHA256=$(nix-prefetch-url ${VSCODIUM_LINUX_URL}) +sed -i "s/x86_64-linux = \".\{52\}\"/x86_64-linux = \"${VSCODIUM_LINUX_SHA256}\"/" "$ROOT/vscodium.nix" + +VSCODIUM_DARWIN_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-darwin-${VSCODIUM_VER}.zip" +VSCODIUM_DARWIN_SHA256=$(nix-prefetch-url ${VSCODIUM_DARWIN_URL}) +sed -i "s/x86_64-darwin = \".\{52\}\"/x86_64-darwin = \"${VSCODIUM_DARWIN_SHA256}\"/" "$ROOT/vscodium.nix"