Comment optional post-install field in the ghcup metadata script and …

…fix typos
haskell · Dec 26, 2024 · 4b1af4a · 4b1af4a
1 parent 731f699
commit 4b1af4a
Showing 1 changed file with 19 additions and 30 deletions.
diff --git a/scripts/release/create-release-metadata-for-ghcup.sh b/scripts/release/create-release-metadata-for-ghcup.sh
@@ -26,49 +26,42 @@ cat <<EOF > /dev/stdout
       viTags:
         - Latest
       viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-$RELEASE.md
-      viPostInstall: *cabal-${RELEASE//./}-post-install
+      # uncomment viPostInstall if the release needs a post-install message
+      # viPostInstall: &cabal-${RELEASE//./}-post-install |
       viArch:
         A_64:
           Linux_UnknownLinux:
             unknown_versioning: &cabal-${RELEASE//./}-64
-            dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-alpine3_12.tar.xz
-            dlSubdir: cabal-install-$RELEASE
-            dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-alpine3_12.tar.xz" | awk '{ print $1 }')
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-alpine3_12.tar.xz
+              dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-alpine3_12.tar.xz" | awk '{ print $1 }')
           Linux_Alpine:
-            unknown_versioning: &cabal-${RELEASE//./}-64
+            unknown_versioning: *cabal-${RELEASE//./}-64
           Linux_CentOS:
             unknown_versioning: &cabal-${RELEASE//./}-64-centos7
-            dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-centos7.tar.xz
-            dlSubdir: cabal-install-$RELEASE
-            dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-centos7.tar.xz" | awk '{ print $1 }')
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-centos7.tar.xz
+              dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-centos7.tar.xz" | awk '{ print $1 }')
           Linux_Debian:
-            ' ( >= 9 && < 10)': &cabal-${RELEASE//./}-64-debian
+            '( >= 9 && < 10)': &cabal-${RELEASE//./}-64-debian
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-deb9.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-deb9.tar.xz" | awk '{ print $1 }')
-            ' ( == 10 && < 11)':
+            '( == 10 && < 11)':
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-deb10.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-deb10.tar.xz" | awk '{ print $1 }')
-            ' ( >= 11)':
+            '( >= 11)':
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-deb11.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-deb11.tar.xz" | awk '{ print $1 }')
-            unknown_versioning: &cabal-${RELEASE//./}-64-debian
+            unknown_versioning: *cabal-${RELEASE//./}-64-debian
           Linux_Fedora:
             '>= 33':
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-fedora33.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-fedora33.tar.xz" | awk '{ print $1 }')
-            unknown_versioning: &cabal-${RELEASE//./}-64-centos7
+            unknown_versioning: *cabal-${RELEASE//./}-64-centos7
           Linux_Ubuntu:
             '< 20': &cabal-${RELEASE//./}-64-ubuntu18
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-ubuntu18_04.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-ubuntu18_04.tar.xz" | awk '{ print $1 }')
             '>= 20': &cabal-${RELEASE//./}-64-ubuntu20
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-linux-ubuntu20_04.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-linux-ubuntu20_04.tar.xz" | awk '{ print $1 }')
             unknown_versioning: *cabal-${RELEASE//./}-64-ubuntu18
           Linux_Mint:
@@ -78,48 +71,44 @@ cat <<EOF > /dev/stdout
           Darwin:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-darwin.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-darwin.tar.xz" | awk '{ print $1 }')
           Windows:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-windows.zip
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-windows.zip" | awk '{ print $1 }')
           FreeBSD:
             unknown_versioning:
-              dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-freebsd.tar.xz
-              dlSubdir: cabal-install-$RELEASE
-              dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-freebsd.tar.xz" | awk '{ print $1 }')
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-x86_64-freebsd-14.tar.xz
+              dlHash: $(sha256sum "cabal-install-$RELEASE-x86_64-freebsd-14.tar.xz" | awk '{ print $1 }')
         A_32:
           Linux_UnknownLinux:
             unknown_versioning: &cabal-${RELEASE//./}-32
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-i386-linux-alpine3_12.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-i386-linux-alpine3_12.tar.xz" | awk '{ print $1 }')
           Linux_Alpine:
             unknown_versioning: *cabal-${RELEASE//./}-32
           Linux_Debian:
             '( >= 9 )':
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-i386-linux-deb9.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-i386-linux-deb9.tar.xz" | awk '{ print $1 }')
             unknown_versioning: *cabal-${RELEASE//./}-32
         A_ARM64:
           Darwin:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-aarch64-darwin.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-aarch64-darwin.tar.xz" | awk '{ print $1 }')
           Linux_Debian:
-            '( >= 10 && < 11)': &cabal-31020-arm64
+            '( >= 10 && < 11)': &cabal-${RELEASE//./}-arm64
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-aarch64-linux-deb10.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-aarch64-linux-deb10.tar.xz" | awk '{ print $1 }')
             '( >= 11)':
               dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-aarch64-linux-deb11.tar.xz
-              dlSubdir: cabal-install-$RELEASE
               dlHash: $(sha256sum "cabal-install-$RELEASE-aarch64-linux-deb11.tar.xz" | awk '{ print $1 }')
             unknown_versioning: *cabal-${RELEASE//./}-arm64
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-$RELEASE/cabal-install-$RELEASE-aarch64-linux-alpine3_18.tar.xz
+              dlHash: $(sha256sum "cabal-install-$RELEASE-aarch64-linux-alpine3_18.tar.xz" | awk '{ print $1 }')
           Linux_UnknownLinux:
             unknown_versioning: *cabal-${RELEASE//./}-arm64
 EOF