Revise installation script

substitution of env var representing path to uploaded sources listing script was broken and needed to be fixed
LedgerProject · Nov 17, 2021 · ed83a0e · ed83a0e
1 parent 523f1ea
commit ed83a0e
Showing 1 changed file with 107 additions and 116 deletions.
diff --git a/provisioning/install.sh b/provisioning/install.sh
@@ -7,155 +7,146 @@ export COMPOSE_PROJECT_NAME='safepkt'
 function build_safepkt_backend_image() {
     cd "$(pwd)/provisioning/web-server" || exit
 
-    if [ -z "${UID_GID}" ];
-    then
-      echo 'Please export system user uid and group gid as environment variable e.g.'
-      echo 'export UID_GID="1000:1000"'
+    if [ -z "${UID_GID}" ]; then
+        echo 'Please export system user uid and group gid as environment variable e.g.'
+        echo 'export UID_GID="1000:1000"'
 
-      return 1
+        return 1
     fi
 
-    if [ -z "${RVT_DIRECTORY}" ] || [ ! -d "${RVT_DIRECTORY}" ];
-    then
-      echo 'Please export path where project-oak/rust-verification-tools were cloned to e.g.'
-      echo 'export RVT_DIRECTORY="/tmp/rust-verification-tools"'
+    if [ -z "${RVT_DIRECTORY}" ] || [ ! -d "${RVT_DIRECTORY}" ]; then
+        echo 'Please export path where project-oak/rust-verification-tools were cloned to e.g.'
+        echo 'export RVT_DIRECTORY="/tmp/rust-verification-tools"'
 
-      return 1
+        return 1
     fi
 
     local workdir
     workdir="$(pwd)"
 
-    ( cd ${RVT_DIRECTORY} && \
-      tar \
-        cvzf \
-        "${workdir}/safepkt/tools.tar.gz" \
-        --exclude-vcs \
-        --exclude='**/target/*' \
-        ./cargo-verify \
-        ./runtime \
-        ./simd_emulation )
+    (cd ${RVT_DIRECTORY} &&
+        tar \
+            cvzf \
+            "${workdir}/safepkt/tools.tar.gz" \
+            --exclude-vcs \
+            --exclude='**/target/*' \
+            ./cargo-verify \
+            ./runtime \
+            ./simd_emulation)
 
     docker-compose \
-    -f ./docker-compose.yml \
-    -f ./docker-compose.override.yml \
-    build \
-    --build-arg UID_GID="${UID_GID}" \
-    --build-arg RVT_DIR="/home/rust-verification-tools" \
-    --build-arg LLVM_VERSION="10" \
-    safepkt && \
-    docker tag safepkt_safepkt:latest safepkt/rvt:verifier
-
-    test -e "${workdir}/safepkt/tools.tar.gz" && \
-      rm "${workdir}/safepkt/tools.tar.gz" && \
-      echo '=> Removed successfully tools archive containing simd_emulation, runtime and cargo-verify directories'
+        -f ./docker-compose.yml \
+        -f ./docker-compose.override.yml \
+        build \
+        --build-arg UID_GID="${UID_GID}" \
+        --build-arg RVT_DIR="/home/rust-verification-tools" \
+        --build-arg LLVM_VERSION="10" \
+        safepkt &&
+        docker tag safepkt_safepkt:latest safepkt/rvt:verifier
+
+    test -e "${workdir}/safepkt/tools.tar.gz" &&
+        rm "${workdir}/safepkt/tools.tar.gz" &&
+        echo '=> Removed successfully tools archive containing simd_emulation, runtime and cargo-verify directories'
 }
 
 function clone_rvt() {
-  source ./.env
-  if [ -z "${RVT_DIRECTORY}" ] || [ -d "${RVT_DIRECTORY}" ];
-  then
-    if [ ! -e "${RVT_DIRECTORY}/.git" ];
-    then
-      echo 'Invalid Rust Verification Tools directory.'
-      echo 'Please export a valid destination path where rvt will be cloned.'
-      echo 'e.g.'
-      echo 'export RVT_DIRECTORY=/tmp/rvt'
-
-      return 1;
+    source ./.env
+    if [ -z "${RVT_DIRECTORY}" ] || [ -d "${RVT_DIRECTORY}" ]; then
+        if [ ! -e "${RVT_DIRECTORY}/.git" ]; then
+            echo 'Invalid Rust Verification Tools directory.'
+            echo 'Please export a valid destination path where rvt will be cloned.'
+            echo 'e.g.'
+            echo 'export RVT_DIRECTORY=/tmp/rvt'
+
+            return 1
+        fi
     fi
-  fi
 
-  if [ -e "${RVT_DIRECTORY}/.git" ];
-  then
-    echo 'RVT project has been cloned already.'
+    if [ -e "${RVT_DIRECTORY}/.git" ]; then
+        echo 'RVT project has been cloned already.'
 
-    return 0
-  fi
+        return 0
+    fi
 
-  git clone https://github.com/project-oak/rust-verification-tools "${RVT_DIRECTORY}"
+    git clone https://github.com/project-oak/rust-verification-tools "${RVT_DIRECTORY}"
 }
 
 function pull_rvt_image() {
-  source ./.env
-  if [ "${RVT_DOCKER_IMAGE}" ] && [ -d "${RVT_DOCKER_IMAGE}" ];
-  then
-    echo 'Invalid container image.'
-    echo 'Please export a non-empty container image for it to be pulled.'
-    echo 'e.g.'
-    echo 'export RVT_DOCKER_IMAGE="thierrymarianne/contrib-rvt_r2ct-llvm-11"'
-
-    return 1;
-  fi
-
-  docker pull "${RVT_DOCKER_IMAGE}"
+    source ./.env
+    if [ "${RVT_DOCKER_IMAGE}" ] && [ -d "${RVT_DOCKER_IMAGE}" ]; then
+        echo 'Invalid container image.'
+        echo 'Please export a non-empty container image for it to be pulled.'
+        echo 'e.g.'
+        echo 'export RVT_DOCKER_IMAGE="thierrymarianne/contrib-rvt_r2ct-llvm-11"'
+
+        return 1
+    fi
+
+    docker pull "${RVT_DOCKER_IMAGE}"
 }
 
 function make_runtime_simd_emulation() {
-  source ./.env
-
-  if [ -z "${RVT_DIRECTORY}" ] || [ -d "${RVT_DIRECTORY}" ];
-  then
-    if [ ! -e "${RVT_DIRECTORY}/.git" ];
-    then
-      echo 'Invalid Rust Verification Tools directory.'
-      echo 'Please export a valid destination path where rvt will be cloned.'
-      echo 'e.g.'
-      echo 'export RVT_DIRECTORY=/tmp/rvt'
-
-      return 1;
+    source ./.env
+
+    if [ -z "${RVT_DIRECTORY}" ] || [ -d "${RVT_DIRECTORY}" ]; then
+        if [ ! -e "${RVT_DIRECTORY}/.git" ]; then
+            echo 'Invalid Rust Verification Tools directory.'
+            echo 'Please export a valid destination path where rvt will be cloned.'
+            echo 'e.g.'
+            echo 'export RVT_DIRECTORY=/tmp/rvt'
+
+            return 1
+        fi
+    fi
+
+    if [ "${RVT_DOCKER_IMAGE}" ] && [ -d "${RVT_DOCKER_IMAGE}" ]; then
+        echo 'Invalid container image.'
+        echo 'Please export a non-empty container image for it to be pulled.'
+        echo 'e.g.'
+        echo 'export RVT_DOCKER_IMAGE="thierrymarianne/contrib-rvt_r2ct-llvm-11"'
+
+        return 1
     fi
-  fi
-
-  if [ "${RVT_DOCKER_IMAGE}" ] && [ -d "${RVT_DOCKER_IMAGE}" ];
-  then
-    echo 'Invalid container image.'
-    echo 'Please export a non-empty container image for it to be pulled.'
-    echo 'e.g.'
-    echo 'export RVT_DOCKER_IMAGE="thierrymarianne/contrib-rvt_r2ct-llvm-11"'
-
-    return 1;
-  fi
-
-  ( docker rm -f rvt 2>&1 || echo 'no running container' ) && \
-  docker run -w /home/rust-verifications-tools/runtime \
-  -v "${RVT_DIRECTORY}:/home/rust-verifications-tools" \
-  --name rvt "${RVT_DOCKER_IMAGE}" make
-
-  ( docker rm -f rvt 2>&1 || echo 'no running container' ) && \
-  docker run -w /home/rust-verifications-tools/simd_emulation \
-  -v "${RVT_DIRECTORY}:/home/rust-verifications-tools" \
-  --name rvt "${RVT_DOCKER_IMAGE}" make
+
+    (docker rm -f rvt 2>&1 || echo 'no running container') &&
+        docker run -w /home/rust-verifications-tools/runtime \
+            -v "${RVT_DIRECTORY}:/home/rust-verifications-tools" \
+            --name rvt "${RVT_DOCKER_IMAGE}" make
+
+    (docker rm -f rvt 2>&1 || echo 'no running container') &&
+        docker run -w /home/rust-verifications-tools/simd_emulation \
+            -v "${RVT_DIRECTORY}:/home/rust-verifications-tools" \
+            --name rvt "${RVT_DOCKER_IMAGE}" make
 }
 
 function copy_configuration_file() {
-  local workdir
-  workdir=$(pwd)
+    local workdir
+    workdir=$(pwd)
 
-  local verify_script_path
-  verify_script_path="${workdir}"'/provisioning/web-server/safepkt/templates/verify.sh'
+    local verify_script_path
+    verify_script_path="${workdir}"'/provisioning/web-server/safepkt/templates/verify.sh'
 
-  local list_uploaded_sources_script_path
-  list_uploaded_sources_script_path="${workdir}"'/provisioning/web-server/safepkt/templates/list-uploaded-sources.sh'
+    local list_uploaded_sources_script_path
+    list_uploaded_sources_script_path="${workdir}"'/provisioning/web-server/safepkt/templates/list-uploaded-sources.sh'
 
-  local id
-  id=$(id "$(whoami)")
+    local id
+    id=$(id "$(whoami)")
 
-  local uid
-  uid=$(echo "${id}" | sed -E 's/uid=([0-9]+).+/\1/g')
+    local uid
+    uid=$(echo "${id}" | sed -E 's/uid=([0-9]+).+/\1/g')
 
-  local gid
-  gid=$(echo "${id}" | sed -E 's/.+gid=([0-9]+).+/\1/g')
+    local gid
+    gid=$(echo "${id}" | sed -E 's/.+gid=([0-9]+).+/\1/g')
 
-  local pattern_list_uploaded_sources
-  pattern_list_uploaded_sources='s#UPLOADED_SOURCES_LISTING_SCRIPT="list-uploaded-sources"'"${list_uploaded_sources_script_path}"'"#g'
+    local pattern_list_uploaded_sources
+    pattern_list_uploaded_sources='s#UPLOADED_SOURCES_LISTING_SCRIPT="list-uploaded-sources"#VERIFICATION_SCRIPT="'"${list_uploaded_sources_script_path}"'"#g'
 
-  local pattern_verify
-  pattern_verify='s#VERIFICATION_SCRIPT="verify"#VERIFICATION_SCRIPT="'"${verify_script_path}"'"#g'
+    local pattern_verify
+    pattern_verify='s#VERIFICATION_SCRIPT="verify"#VERIFICATION_SCRIPT="'"${verify_script_path}"'"#g'
 
-  # shellcheck disable=SC2002
-  cat "${workdir}/.env.dist" | \
-    sed -E "${pattern_list_uploaded_sources}" | \
-    sed -E "${pattern_verify}" | \
-    sed -E 's/uid:gid/'"${uid}:${gid}"'/g' > "${workdir}/.env"
-}
+    # shellcheck disable=SC2002
+    cat "${workdir}/.env.dist" |
+        sed -E "${pattern_list_uploaded_sources}" |
+        sed -E "${pattern_verify}" |
+        sed -E 's/uid:gid/'"${uid}:${gid}"'/g' >"${workdir}/.env"
+}