Skip to content

Commit 754b3f2

Browse files
authored
Merge pull request #568 from KiraCore/feature/update_app_config
feature/update_app_config -> release/v0.12.24
2 parents a2ddd50 + 159247c commit 754b3f2

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

RELEASE.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
Features:
22

3-
* Update tools version
3+
* Update app.toml configuration
4+
* Add app.toml grpc setting
5+

kira/configure.sh

+17-8
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ globSet EXTERNAL_ADDRESS "$cfg_p2p_external_address"
5757
globSet EXTERNAL_DNS "$EXTERNAL_DNS"
5858
globSet EXTERNAL_PORT "$EXTERNAL_P2P_PORT"
5959

60+
#Set grpc listening address for app.toml
61+
globSet app_grpc_address "0.0.0.0:9090"
62+
6063
echoInfo "INFO: Local Addr: $LOCAL_IP"
6164
echoInfo "INFO: Public Addr: $PUBLIC_IP"
6265
echoInfo "INFO: External Addr: $EXTERNAL_ADDRESS"
@@ -281,19 +284,25 @@ for row in "${cfg_rows[@]}"; do
281284
done
282285

283286
echoInfo "INFO: Updating APP file..."
287+
284288
getTomlVarNames $APP > /tmp/app_names.tmp
289+
285290
mapfile app_rows < /tmp/app_names.tmp
291+
286292
for row in "${app_rows[@]}"; do
287293
( $(isNullOrWhitespaces $row) ) && continue
288-
tag=$(echo $row | cut -d' ' -f1 | tr -d '\011\012\013\014\015\040\133\135' | xargs)
289-
name=$(echo $row | cut -d' ' -f2 | tr -d '\011\012\013\014\015\040\133\135' | xargs)
290-
val_target_1=$(echo "app_${tag}_${name}" | tr -d '\011\012\013\014\015\040\133\135' | xargs)
291-
val_target_2=$(echo "$val_target_1" | sed -r 's/[-]+/_/g' | xargs)
292-
val="${!val_target_2}"
293-
[ -z "$val" ] && val=$(globGet "$val_target_1")
294+
295+
tag=$(echo $row | cut -d' ' -f1 | tr -d '\\011\\012\\013\\014\\015\\040\\133\\135' | xargs)
296+
name=$(echo $row | cut -d' ' -f2 | tr -d '\\011\\012\\013\\014\\015\\040\\133\\135' | xargs)
297+
298+
val_target_1="app_${tag}_${name}"
299+
val_target_2=$(echo "$val_target_1" | sed -r 's/\[-\]+/\_/g')
300+
301+
val=$(globGet "$val_target_1")
294302
[ -z "$val" ] && val=$(globGet "$val_target_2")
295-
if [ ! -z "$val" ] ; then
296-
echoWarn "WARNING: Updating APP value: [$tag] $name -> '$val' "
303+
304+
if [ ! -z "$val" ]; then
305+
echoWarn "WARNING: Updating APP value: [$tag] $name -> '$val'"
297306
setTomlVar "[$tag]" "$name" "$val" $APP
298307
else
299308
echoInfo "INFO: APP value: [$tag] $name will NOT change, glob val was NOT found"

nvim

Whitespace-only changes.

scripts/version.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env bash
22

3-
echo "v0.12.23"
3+
echo "v0.12.24"

0 commit comments

Comments
 (0)