Skip to content

Commit c4346cd

Browse files
committed
Fixed: Configuration file failing to load
1 parent 73a9f0b commit c4346cd

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- none
1111

12+
## [1.3.1] - 2024-11-29
13+
14+
### Fixed
15+
16+
- Configuration file failing to load
17+
1218
## [1.3.0] - 2024-11-29
1319

1420
### Added

noirnet

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
# App version and name
88
APP_NAME="NoirNet"
9-
VERSION=1.3.0
9+
VERSION=1.3.1
1010
LAST_UPDATED="2024-11-29"
1111

1212
# TODO:
@@ -1068,7 +1068,9 @@ process_arguments() {
10681068
[[ "$SHOW_HELP" = true ]] && show_help
10691069

10701070
# Override config settings with command line options
1071-
[[ "$INIT" = false ]] && load_config "$CONFIG_FILE"
1071+
if [[ -z "$INIT" || "$INIT" = false ]]; then
1072+
load_config "$CONFIG_FILE"
1073+
fi
10721074
[[ -n "$CLI_VERBOSE" ]] && VERBOSE="$CLI_VERBOSE"
10731075
[[ -n "$CLI_CACHE_DIR" ]] && CACHE_DIR="$CLI_CACHE_DIR"
10741076

@@ -1098,8 +1100,8 @@ process_arguments() {
10981100
[[ -n "$CLI_TIMEOUT" ]] && TIMEOUT="$CLI_TIMEOUT"
10991101
[[ -n "$CLI_PING_TARGET" ]] && PING_TARGET="$CLI_PING_TARGET"
11001102
[[ -n "$CLI_DNS_TEST_DOMAIN" ]] && DNS_TEST_DOMAIN="$CLI_DNS_TEST_DOMAIN"
1101-
[[ "$SHOW_CONFIG" = true ]] && show_config && show_version && exit
11021103
[[ "$SHOW_CONFIG_FILE" = true ]] && show_config_file
1104+
[[ "$SHOW_CONFIG" = true ]] && show_config && show_version && exit
11031105
[[ "$INIT" = true ]] && init_config
11041106
}
11051107

noirnet.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH NOIRNET 1 "November 29, 2024" "Version 1.3.0" "User Commands"
1+
.TH NOIRNET 1 "November 29, 2024" "Version 1.3.1" "User Commands"
22
.SH NAME
33
NoirNet \- Monitors internet and DNS access and sends notifications.
44

0 commit comments

Comments
 (0)