Update scripts/regenerate.sh

Co-authored-by: Arvind Bright <[email protected]>
aranjans · Apr 10, 2024 · f600613 · f600613
1 parent 13bd2f2
commit f600613
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/scripts/regenerate.sh b/scripts/regenerate.sh
@@ -46,7 +46,7 @@ git clone --quiet https://github.com/protocolbuffers/protobuf "${WORKDIR}/protob
 # Pull in code.proto as a proto dependency
 mkdir -p "${WORKDIR}/googleapis/google/rpc"
 echo "curl https://raw.githubusercontent.com/googleapis/googleapis/master/google/rpc/code.proto"
-curl --silent https://raw.githubusercontent.com/googleapis/googleapis/master/google/rpc/code.proto > "${WORKDIR}"/googleapis/google/rpc/code.proto
+curl --silent https://raw.githubusercontent.com/googleapis/googleapis/master/google/rpc/code.proto > "${WORKDIR}/googleapis/google/rpc/code.proto"
 
 source ./scripts/protoc_installer.sh
 download_protoc

diff --git a/scripts/vet.sh b/scripts/vet.sh
@@ -26,21 +26,9 @@ if [[ "$1" = "-install" ]]; then
     github.com/client9/misspell/cmd/misspell
   popd
   if [[ -z "${VET_SKIP_PROTO}" ]]; then
-<<<<<<< HEAD
     source ./scripts/protoc_installer.sh
     download_protoc
     protoc --version
-=======
-    if [[ "${GITHUB_ACTIONS}" = "true" ]]; then
-      source ./scripts/protoc_installer.sh
-      pushd /home/runner/go
-      download_protoc
-      bin/protoc --version
-      popd
-    elif not which protoc > /dev/null; then
-      die "Please install protoc into your path"
-    fi
->>>>>>> beb91247 (Migrate all the shell scripts to scripts directory)
   fi
   exit 0
 elif [[ "$#" -ne 0 ]]; then