More refinements on the reproducible build script

Author: xxuejie

standalone-contract/scripts/reproducible_build_docker

@@ -8,7 +8,7 @@ set -ex
 
 DOCKER="${DOCKER:-docker}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-docker.io/cryptape/llvm-n-rust:20240630}"
-CHECKSUM_FILE_PATH="checksums.txt"
+CHECKSUM_FILE_PATH="${CHECKSUM_FILE_PATH:-checksums.txt}"
 
 # We are parsing command line arguments based on tips from:
 # https://stackoverflow.com/a/14203146
@@ -24,10 +24,6 @@ while [[ $# -gt 0 ]]; do
       UPDATE="yes"
       shift # past argument
       ;;
-    -s|--sudo)
-      SUDO="yes"
-      shift # past argument
-      ;;
     --no-clean)
       NOCLEAN="yes"
       shift # past argument
@@ -44,7 +40,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ -n "${PROXY}" ]]; then
-  PROXY_ARGS="-e ALL_PROXY=${PROXY} -e HTTPS_PROXY=${PROXY} -e HTTP_PROXY=${PROXY}"
+  DOCKER_RUN_ARGS="-e ALL_PROXY=${PROXY} -e HTTPS_PROXY=${PROXY} -e HTTP_PROXY=${PROXY} ${DOCKER_RUN_ARGS}"
 fi
 
 TASKS=""
@@ -58,13 +54,9 @@ else
   TASKS+=" build "
 fi
 
-if [[ "${SUDO}" = "yes" ]]; then
-  PREFIX="sudo"
-fi
-
-$PREFIX $DOCKER run --rm $DOCKER_RUN_ARGS $PROXY_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
+$DOCKER run --rm $DOCKER_RUN_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
 # Reset file ownerships for all files docker might touch
-$PREFIX $DOCKER run --rm $DOCKER_RUN_ARGS $PROXY_ARGS -e UID=`id -u` -e GID=`id -g` -v `pwd`:/code $DOCKER_IMAGE bash -c 'chown -R -f $UID:$GID checksums.txt build target'
+$DOCKER run --rm $DOCKER_RUN_ARGS -e UID=`id -u` -e GID=`id -g` -v `pwd`:/code $DOCKER_IMAGE bash -c 'chown -R -f $UID:$GID checksums.txt build target'
 
 if [[ "${UPDATE}" = "yes" ]]; then
   echo "${CHECKSUM_FILE_PATH} file is updated with latest binary hashes!"

workspace/scripts/reproducible_build_docker

@@ -8,7 +8,7 @@ set -ex
 
 DOCKER="${DOCKER:-docker}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-docker.io/cryptape/llvm-n-rust:20240630}"
-CHECKSUM_FILE_PATH="checksums.txt"
+CHECKSUM_FILE_PATH="${CHECKSUM_FILE_PATH:-checksums.txt}"
 
 # We are parsing command line arguments based on tips from:
 # https://stackoverflow.com/a/14203146
@@ -24,10 +24,6 @@ while [[ $# -gt 0 ]]; do
       UPDATE="yes"
       shift # past argument
       ;;
-    -s|--sudo)
-      SUDO="yes"
-      shift # past argument
-      ;;
     --no-clean)
       NOCLEAN="yes"
       shift # past argument
@@ -44,7 +40,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ -n "${PROXY}" ]]; then
-  PROXY_ARGS="-e ALL_PROXY=${PROXY} -e HTTPS_PROXY=${PROXY} -e HTTP_PROXY=${PROXY}"
+  DOCKER_RUN_ARGS="-e ALL_PROXY=${PROXY} -e HTTPS_PROXY=${PROXY} -e HTTP_PROXY=${PROXY} ${DOCKER_RUN_ARGS}"
 fi
 
 TASKS=""
@@ -58,13 +54,9 @@ else
   TASKS+=" build "
 fi
 
-if [[ "${SUDO}" = "yes" ]]; then
-  PREFIX="sudo"
-fi
-
-$PREFIX $DOCKER run --rm $DOCKER_RUN_ARGS $PROXY_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
+$DOCKER run --rm $DOCKER_RUN_ARGS -v `pwd`:/code $DOCKER_IMAGE make $TASKS
 # Reset file ownerships for all files docker might touch
-$PREFIX $DOCKER run --rm $DOCKER_RUN_ARGS $PROXY_ARGS -e UID=`id -u` -e GID=`id -g` -v `pwd`:/code $DOCKER_IMAGE bash -c 'chown -R -f $UID:$GID checksums.txt build target'
+$DOCKER run --rm $DOCKER_RUN_ARGS -e UID=`id -u` -e GID=`id -g` -v `pwd`:/code $DOCKER_IMAGE bash -c 'chown -R -f $UID:$GID checksums.txt build target'
 
 if [[ "${UPDATE}" = "yes" ]]; then
   echo "${CHECKSUM_FILE_PATH} file is updated with latest binary hashes!"