From 723ba12ab688278aeb7d67729d36d22029f2f073 Mon Sep 17 00:00:00 2001
From: William Banfield <wbanfield@gmail.com>
Date: Wed, 10 Nov 2021 17:39:32 -0500
Subject: [PATCH] fix scripts to not duplicate go_option

---
 scripts/protocgen.sh    | 2 ++
 scripts/protopackage.sh | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
index c6ecfbae9..b4b75a9f6 100755
--- a/scripts/protocgen.sh
+++ b/scripts/protocgen.sh
@@ -7,6 +7,8 @@ if [[ VERS -ne master ]]; then
     URL_PATH=tarball/refs/tags/v
 fi
 
+VERS=5dddbbef96b6b39237e7a113363da0ffa0bdf21f
+
 echo "fetching proto files"
 
 # Get shortened ref of commit
diff --git a/scripts/protopackage.sh b/scripts/protopackage.sh
index 477e370be..d8b0f48be 100755
--- a/scripts/protopackage.sh
+++ b/scripts/protopackage.sh
@@ -8,6 +8,8 @@ set -eo pipefail
 
 FNAME=$1
 MODNAME=$(echo $2| sed 's/\//\\\//g')
-PACKAGE="$(dirname $FNAME | cut -c 2- | sed 's/\//\\\//g')"
+PACKAGE="$(dirname $FNAME | sed 's/^\.\/\(.*\)/\1/g' | sed 's/\//\\\//g')"
 
-sed -i "s/\(package tendermint.*\)/\1\n\noption go_package = \"$MODNAME$PACKAGE\";/g" $FNAME
+if ! `grep -q 'option go_package = .*;' $FNAME`; then 
+	sed -i "s/\(package tendermint.*\)/\1\n\noption go_package = \"$MODNAME\/$PACKAGE\";/g" $FNAME
+fi