Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add opam 2.2.0 to the install scripts #6062

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Add opam 2.2.0 to the install scripts #6062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ users)

## Install script
* Provide a shell/install.ps1 PowerShell script to install opam on Windows [#5906 @kit-ty-kate @dra27]
* Add opam 2.2.0 to the install scripts [#6062 @kit-ty-kate]

## Admin

Expand Down
7 changes: 4 additions & 3 deletions shell/install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,20 @@ param (
# Install the latest alpha, beta or rc
[switch]$Dev,
# Install this specific version of opam instead of the latest
[string]$Version = "2.2.0~rc1",
[string]$Version = "2.2.0",
# Specify the installation directory for the opam binary
[string]$OpamBinDir = $null
)

$DevVersion = "2.2.0~rc1"
$DevVersion = "2.2.0"
$IsAdmin = (New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)
$DefaultBinDir = If ($IsAdmin) {"$Env:ProgramFiles\opam\bin"} Else {"$Env:LOCALAPPDATA\Programs\opam\bin"}

$SHA512s = @{
"opam-2.2.0-beta2-x86_64-windows.exe" = "74f034ccc30ef0b2041283ff125be2eab565d4019e79f946b515046c4c290a698266003445f38b91321a9ef931093651f861360906ff06c076c24d18657e2aaf";
"opam-2.2.0-beta3-x86_64-windows.exe" = "f09337d94e06cedb379c5bf45a50a79cf2b2e529d7c2bb9b35c8a56d40902ff8c7e3f4de9c75fb5c8dd8272b87b2a2645b14e40ef965376ef0d19afd923acf3b";
"opam-2.2.0-rc1-x86_64-windows.exe" = "f2ec830a5706c45cb56a96713e296ef756c3f2904ca15f7c2ad0442916a9585fa1de8070208f2a6bb3a84dc74b677f946f5bc386c8ed1489da802b1d66a5e094";
"opam-2.2.0-rc1-x86_64-windows.exe" = "f2ec830a5706c45cb56a96713e296ef756c3f2904ca15f7c2ad0442916a9585fa1de8070208f2a6bb3a84dc74b677f946f5bc386c8ed1489da802b1d66a5e094";
"opam-2.2.0-x86_64-windows.exe" = "171b679c192801f7ec783de4c51d614055cff167d521d31c543b6bed14d9eb3d37a808be4d83ff9acfd0fc1d7008e6582dce245836a51109fc0cb8456528c473";
}

Function DownloadAndCheck {
Expand Down
15 changes: 13 additions & 2 deletions shell/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set -ue
# (c) Copyright Fabrice Le Fessant INRIA/OCamlPro 2013
# (c) Copyright Louis Gesbert OCamlPro 2014-2017

VERSION='2.1.6'
DEV_VERSION='2.2.0~rc1'
VERSION='2.2.0'
DEV_VERSION='2.2.0'
DEFAULT_BINDIR=/usr/local/bin

bin_sha512() {
Expand Down Expand Up @@ -260,6 +260,17 @@ bin_sha512() {
opam-2.2.0-rc1-x86_64-macos) echo "a4845e00b2aa7f1da7d528dc0b473e72cade71b2e07844ea1a440d076ee2f000c5e2c055dbe1b997b2e75b5daf0d2f9a9a0b13f0561ab8ee0bbe301153b21e82";;
opam-2.2.0-rc1-x86_64-openbsd) echo "45be7dc22cd71284adf98511df2d5141806aa8d6bb69163d85fd433221ea41a3e125b9c83c1bc5ac5f4b5bfdde6d2ffb26d3c1e36713e55ab3f6cd76291bfe00";;

opam-2.2.0-arm64-linux) echo "ed8bf4739922a736b8a41f1f89c941d280bda4fc7f79dd3f368c6e1fec5e82d5a3198ae1e5d1b8f7c33f339f813f7677a7c797fd8fb82093ea0f091a4192f3ef";;
opam-2.2.0-arm64-macos) echo "43d112219844358db9a1ffdbd38704f7bb038036df4cf9df47d66c8400c530f4c2e2d8cc78129f5575cd463917b8bdd7241e9a35957b6acb98c21b1228071824";;
opam-2.2.0-armhf-linux) echo "f0e170ee075cec57dfff79965d6e53bf0a95d847a9903f153d44da1377304523deb34b4d8d3613848bdf011ff949f71618fcd05332ccc48d1d3f160f5423b6b9";;
opam-2.2.0-i686-linux) echo "dbbad150cae2bc31db225bbf27c5a570535b729985ba482f594bff994beaaff68345424e931cbfe9d6735c8b169b7fadc48abf2dac0f518bc2551a732757ed0f";;
opam-2.2.0-ppc64le-linux) echo "f5de77511067fe26df4549df5815cb552884a600823d97b85c03be5a2f52b8ee908a3cd413b9ab22222bc863994fec604d8e5b35406d472fdd46e4508a540b64";;
opam-2.2.0-s390x-linux) echo "67c9031f7ae3d36a0debb71da5fab8ad11d77d3d16c09b18379dfd58f371823a109ea21b4590d3488a6c1618b79ff7877a35045580a4eca1c883716f266717aa";;
opam-2.2.0-x86_64-freebsd) echo "a3202009436a1a8aa1d6602aa39b7ed579e3e9e60807acedcc5a349341038030fee52000039a37df88e3acbf2a44bde21b2061874d9a997858bb8327c42315a4";;
opam-2.2.0-x86_64-linux) echo "3790ab9076fc2a7060a588a51e0af8ead536a9a1235371b8641b0c6200ad49066a8ad4b9b5f8c510ba274e54f48c2f3f007e3e1ac13161c3d5b16c22ba342d5a";;
opam-2.2.0-x86_64-macos) echo "d32f7fe7fb9a126cb79f679317914639ddf77765071c8d509eba3acc7585f346d8634cd6e611df78f8c3b546bdca6de82fb4965740b381b76c458b9ba1134e88";;
opam-2.2.0-x86_64-openbsd) echo "98d0b20e3d833070e4656ccfde586a47c680cc4e3ee049c36296032be3eecf5fda3b39cf672060febbe2d12b032cb0b22a3934ad474d2c8433831f96d766eff5";;

*) echo "no sha";;
esac
}
Expand Down
Loading