From 3b1617419052a2201b880e16a0ab3df69d1bcbc7 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 12 Sep 2022 14:53:15 +0200
Subject: [PATCH] Replace /root/project by /project

---
 .circleci/config.yml                                | 6 +++---
 scripts/build_emscripten.sh                         | 2 +-
 scripts/ci/build_emscripten.sh                      | 4 ++--
 scripts/ci/build_ossfuzz.sh                         | 2 +-
 scripts/ci/docker_upgrade.sh                        | 8 ++++----
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 8 ++++----
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b301e2ed..35d04306d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1016,15 +1016,15 @@ jobs:
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr
 
-  # NOTE: work around to git unsafe repository error by adding /root/project as a safe.directory
-  # See https://github.com/CircleCI-Public/cimg-base/issues/170
   b_ems:
     <<: *base_ems_large
     environment:
       TERM: xterm
       MAKEFLAGS: -j 10
     steps:
-      - run: git config --global --add safe.directory /root/project
+      # NOTE: work around to git unsafe repository error by adding /project as a safe.directory
+      # See https://github.com/CircleCI-Public/cimg-base/issues/170
+      - run: git config --global --add safe.directory /project
       - checkout
       - run:
           name: Build
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 4c48cc441..04dd49a28 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -38,4 +38,4 @@ fi
 docker run --volume "$(pwd):/project" --workdir /project \
     --user "1000:1000" \
     solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \
-    ./scripts/ci/build_emscripten.sh "$BUILD_DIR" /project
+    ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index 543909016..3baf8e94a 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -40,9 +40,9 @@ else
 	BUILD_DIR="$1"
 fi
 
-WORKSPACE="${2:-/root/project}"
+WORKSPACE=/project
 
-cd "$WORKSPACE"
+cd $WORKSPACE
 
 # shellcheck disable=SC2166
 if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]
diff --git a/scripts/ci/build_ossfuzz.sh b/scripts/ci/build_ossfuzz.sh
index 1240b6877..d4186f816 100755
--- a/scripts/ci/build_ossfuzz.sh
+++ b/scripts/ci/build_ossfuzz.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -ex
 
-ROOTDIR="/root/project"
+ROOTDIR="/project"
 BUILDDIR="${ROOTDIR}/build"
 mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps"
 
diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh
index a6b59e157..838814d60 100755
--- a/scripts/ci/docker_upgrade.sh
+++ b/scripts/ci/docker_upgrade.sh
@@ -51,16 +51,16 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}
 
 echo "-- test_docker @ '${PWD}'"
 
-# NOTE: Since /root/project/ is a dir from outside the container and the owner of the files is different,
+# NOTE: Since /project/ is a dir from outside the container and the owner of the files is different,
 # git show in the script refuses to work. It must be marked as safe to use first.
 # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run \
   --rm \
-  --volume "${PWD}:/root/project" \
+  --volume "${PWD}:/project" \
   "${IMAGE_NAME}" \
   bash -c "
-    git config --global --add safe.directory /root/project &&
-    /root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
+    git config --global --add safe.directory /project &&
+    /project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
   "
 
 echo "-- push_docker"
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 9ef9caaa8..81f06438e 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -183,14 +183,14 @@ function process_tag
 cd /tmp
 
 echo "Check out solidity repository..."
-if [ -d /root/project ]; then
+if [ -d /project ]; then
   echo "Solidity repo checkout already exists."
 else
-  git clone "${SOLIDITY_REPO_URL}" /root/project --quiet
+  git clone "${SOLIDITY_REPO_URL}" /project --quiet
 fi
 
 echo "Extract bytecode comparison scripts from v0.6.1..."
-cd /root/project
+cd /project
 git checkout v0.6.1 --quiet
 cp scripts/bytecodecompare/storebytecode.sh /tmp
 # shellcheck disable=SC2016
@@ -212,7 +212,7 @@ ln -sf /emsdk_portable/emscripten/sdk/ /emsdk_portable/
 ln -sf sdk /emsdk_portable/emscripten/bin
 ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin
 rm -rf /src
-ln -sf /root/project /src
+ln -sf /project /src
 
 echo "Install dependencies and upgrade system packages."
 apt-get -qq update >/dev/null 2>&1