Skip to content

Commit 9fbde7b

Browse files
committed
change regen to unmodified
1 parent 17ab557 commit 9fbde7b

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

bin/regen-protobufs.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
#gsed -i 's/import "\//import ".\//g' ./protobufs/meshtastic/*
55
#gsed -i 's/package meshtastic;//g' ./protobufs/meshtastic/*
66

7-
./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./meshtastic/pbDefinitions ./protobufs/meshtastic/*.proto
7+
./nanopb-0.4.7/generator-bin/protoc -I=protobufs --python_out ./ ./protobufs/meshtastic/*.proto
88

99
# workaround for import bug in protoc https://github.com/protocolbuffers/protobuf/issues/1491#issuecomment-690618628
1010

1111
if [[ $OSTYPE == 'darwin'* ]]; then
12-
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/pbDefinitions/*.py
12+
sed -i '' -E 's/^(import.*_pb2)/from . \1/' meshtastic/*.py
1313
# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
14-
sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
14+
sed -i '' -E "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
1515
else
16-
sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/pbDefinitions/*.py
16+
sed -i -e 's/^import.*_pb2/from . \0/' meshtastic/*.py
1717
# automate the current workaround (may be related to Meshtastic-protobufs issue #27 https://github.com/meshtastic/protobufs/issues/27)
18-
sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/pbDefinitions/mesh_pb2.py
18+
sed -i -e "s/^None = 0/globals()['None'] = 0/" meshtastic/mesh_pb2.py
1919
fi

0 commit comments

Comments
 (0)