diff --git a/tools/kothic b/tools/kothic index a7a36fc415..89b59de837 160000 --- a/tools/kothic +++ b/tools/kothic @@ -1 +1 @@ -Subproject commit a7a36fc4152bdbbb0569bd505199381244eb926c +Subproject commit 89b59de837d5751c3247cd20a803b55a7b320f05 diff --git a/tools/unix/generate_drules.sh b/tools/unix/generate_drules.sh index 1ffd7ae13c..6f3a8fbfc1 100755 --- a/tools/unix/generate_drules.sh +++ b/tools/unix/generate_drules.sh @@ -15,7 +15,7 @@ function BuildDrawingRules() { # Cleanup rm "$DATA_PATH"/drules_proto$suffix.{bin,txt} || true # Run script to build style - python "$OMIM_PATH/tools/kothic/src/libkomwm.py" --txt \ + python3 "$OMIM_PATH/tools/kothic/src/libkomwm.py" --txt \ -s "$DATA_PATH/styles/$styleType/style-$styleName/style.mapcss" \ -o "$DATA_PATH/drules_proto$suffix" } @@ -37,10 +37,10 @@ BuildDrawingRules vehicle night _vehicle_dark cp $OMIM_PATH/data/drules_proto_clear.bin $OMIM_PATH/data/drules_proto_design.bin echo "Exporting transit colors" -python "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \ +python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \ "$DATA_PATH/colors.txt" > /dev/null echo "Merging default and vehicle styles" -python "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \ +python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \ "$DATA_PATH/drules_proto_clear.bin" "$DATA_PATH/drules_proto_vehicle_clear.bin" \ "$DATA_PATH/drules_proto.bin" "$DATA_PATH/drules_proto.txt" > /dev/null