Cleanup

Author: jkachmar

common/copy_ghcup.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+ghcup_img="$1"
+builder_cntr="$2"
+
+ghcup_cntr=$(buildah from --signature-policy=./policy.json "${ghcup_img}")
+ghcup_mnt=$(buildah mount "${ghcup_cntr}")
+builder_mnt=$(buildah mount "${builder_cntr}")
+
+cp "${ghcup_mnt}/usr/bin/ghcup" "${builder_mnt}/usr/bin/ghcup"
+
+# Clean up intermediate container.
+buildah rm "${ghcup_cntr}"

common/copy_ghcup_bin_dir.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+
+ghcup_img="$1"
+builder_cntr="$2"
+
+ghcup_cntr=$(buildah from --signature-policy=./policy.json "${ghcup_img}")
+ghcup_mnt=$(buildah mount "${ghcup_cntr}")
+builder_mnt=$(buildah mount "${builder_cntr}")
+
+cp -r "${ghcup_mnt}/root/.ghcup" "${builder_mnt}/root/.ghcup"
+
+# Clean up intermediate container.
+buildah rm "${ghcup_cntr}"

common/validate_checksum.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+set -eu
+
+file_path="$1"
+expected_checksum="$2"
+
+if ! echo "${expected_checksum}  ${file_path}" | sha256sum -c -; then
+    echo "${file_path} checksum failed" >&2
+    echo "expected '${expected_checksum}', but got '$( sha256sum "${file_path}" )'" >&2
+    exit 1
+fi;

ghc/builder.sh

@@ -54,13 +54,13 @@ while getopts "a:c:g:i:n:h" opt; do
           image="${OPTARG}"
     };;
     n ) {
-        if [ "${OPTARG}" = "gmp" ] || [ "${OPTARG}" = "simple" ]; then
-          numeric="${OPTARG}"
-        else
+          if [ "${OPTARG}" = "gmp" ] || [ "${OPTARG}" = "simple" ]; then
+            numeric="${OPTARG}"
+          else
             echo "Invalid NUMERIC argument (i.e. '-n')." >&2
             echo "Expected either 'gmp' or 'simple', got '${OPTARG}'" >&2
             exit 1
-        fi;
+          fi;
     };;
     h ) {
           echo "${usage}"
@@ -87,12 +87,6 @@ image="${image}-${numeric}"
 ################################################################################
 
 # Create the container that will be used to compile GHC from source.
-#
-# NOTE: Alternatively: `buildah commit --rm` (at the end of the script) removes
-# the working container.
-#
-# XXX: Reusing the container by name if it exists seems like not the best idea
-# but it's convenient for development.
 buildah \
     --signature-policy=./policy.json \
     --name "${container}" \
@@ -102,9 +96,7 @@ buildah \
 # Copy `ghcup` from another container.
 ################################################################################
 
-# XXX: Maybe the `"ghcup"` image name should be fully qualified (i.e.
-# "localhost/ghcup" for an image built locally)...?
-buildah unshare ./ghc/copy_ghcup.sh "ghcup" "${container}"
+buildah unshare ./common/copy_ghcup.sh "ghcup" "${container}"
 
 ################################################################################
 # Dependencies.

ghc/copy_ghcup.sh

@@ -58,9 +58,10 @@ if [ "$#" -ne 0 ]; then
 fi
 
 ################################################################################
-# Container and basic dependencies.
+# Container.
 ################################################################################
 
+# Create the container that will be used to download `ghcup`.
 buildah \
     --signature-policy=./policy.json \
     --name "${container}" \
@@ -93,7 +94,7 @@ buildah run "${container}" \
 
 # Copy the checksum validation script into the container...
 buildah copy --chmod 111 "${container}" \
-    ./ghcup/validate_checksum.sh \
+    ./common/validate_checksum.sh \
     /tmp/validate_checksum.sh
 
 # ...and verify that the expected and actual actual `ghcup` checksums match.