Make pod gen related scripts git repo dir relative (#3131)

GoogleDataTransport/generate_project.sh

@@ -16,6 +16,6 @@
 #
 
 # From https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+readonly DIR="$(git rev-parse --show-toplevel)"
 
-pod gen "$DIR/../GoogleDataTransport.podspec" --auto-open --gen-directory="$DIR/gen" --clean
+pod gen "$DIR/GoogleDataTransport.podspec" --auto-open --gen-directory="$DIR/gen" --clean

GoogleDataTransportCCTSupport/ProtoSupport/generate_cct_protos.sh

@@ -20,15 +20,14 @@
 
 # Dependencies: git, protobuf, python-protobuf, pyinstaller
 
-# From https://stackoverflow.com/a/246128/361918
-readonly DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+readonly DIR="$( git rev-parse --show-toplevel )"
 
 # Current release of nanopb being used  to build the CCT protos
 readonly NANOPB_VERSION="0.3.9.2"
-readonly NANOPB_TEMPDIR="${DIR}/nanopb_temp"
+readonly NANOPB_TEMPDIR="${DIR}/GoogleDataTransportCCTSupport/nanopb_temp"
 
-readonly LIBRARY_DIR="${DIR}/../GDTCCTLibrary/"
-readonly PROTO_DIR="${DIR}/Protos/"
+readonly LIBRARY_DIR="${DIR}/GoogleDataTransportCCTSupport/GDTCCTLibrary/"
+readonly PROTO_DIR="${DIR}/GoogleDataTransportCCTSupport/ProtoSupport/Protos/"
 readonly PROTOGEN_DIR="${LIBRARY_DIR}/Protogen/"
 
 rm -rf "${NANOPB_TEMPDIR}"
@@ -47,7 +46,7 @@ echo "Removing existing CCT protos..."
 rm -rf "${PROTOGEN_DIR}/*"
 
 echo "Generating CCT protos..."
-python "${DIR}"/proto_generator.py \
+python "${DIR}/GoogleDataTransportCCTSupport/ProtoSupport/proto_generator.py" \
   --nanopb \
   --protos_dir="${PROTO_DIR}" \
   --pythonpath="${NANOPB_TEMPDIR}/${NANOPB_BIN_DIR}/generator" \

GoogleDataTransportCCTSupport/generate_project.sh

@@ -15,9 +15,8 @@
 # limitations under the License.
 #
 
-# From https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+readonly DIR="$( git rev-parse --show-toplevel )"
 
-"$DIR/ProtoSupport/generate_cct_protos.sh" || echo "Something went wrong generating protos.";
+"$DIR/GoogleDataTransportCCTSupport/ProtoSupport/generate_cct_protos.sh" || echo "Something went wrong generating protos.";
 
-pod gen "${DIR}/../GoogleDataTransportCCTSupport.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}/../" --clean
+pod gen "${DIR}/GoogleDataTransportCCTSupport.podspec" --auto-open --gen-directory="${DIR}/gen" --local-sources="${DIR}" --clean