fix: restore PATH variable at end of execution

grpc · May 9, 2024 · 5878795 · 5878795
1 parent eb40292
commit 5878795
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/regenerate.sh b/scripts/regenerate.sh
@@ -21,11 +21,12 @@ function finish {
   rm -rf "$WORKDIR"
   # Revert back the PATH to client's original value
   export PATH=$RESTORED_PATH
+  echo "Restored PATH to older value: $PATH"
 }
 trap finish EXIT
 
 GOBIN="${WORKDIR}"/bin
-RESTORED_PATH=PATH
+RESTORED_PATH=$PATH
 export PATH="${GOBIN}:${PATH}"
 mkdir -p "${GOBIN}"
 

diff --git a/scripts/vet-proto.sh b/scripts/vet-proto.sh
@@ -23,7 +23,6 @@ if [[ "$1" = "-install" ]]; then
   if [[ "${GITHUB_ACTIONS}" = "true" ]]; then
     PROTOBUF_VERSION=25.2 # Shows up in pb.go files as v4.22.0
     PROTOC_FILENAME=protoc-${PROTOBUF_VERSION}-linux-x86_64.zip
-    chmod +x ./scripts/install_protoc.sh
     source ./scripts/install_protoc.sh "/home/runner/go"
   else
     # TODO: replace with install protoc when https://github.com/grpc/grpc-go/pull/7064 is merged.