PADD v3.6.7 #204
Merged
PADD v3.6.7 #204
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
chdir to the directory padd.sh is stored in before executing the rest of the script. Prevents the formation of PADD.pid and piHoleVersion files everywhere. Fixes #62
- Show the version as N/A (Not Available) instead of v-1 - Don't show out-of-date message in status message
Fixed issues that occur if WebAdmin not installed
Don't litter
For reference, see - https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_(Select_Graphic_Rendition)_parameters The escape sequences for some terminals (e.g. rxvt-unicode) contain semicolons in them. E.g. `tput setaf 0` returns "�[38;5;0m" Now, we set heatmap colors using these escape sequences, and we store the heatmap in ./piHoleVersion without quoting it. So, when we source ./piHoleVersion, bash interprets the semicolons as command-separators, and shows a bunch of errors like these - piHoleVersion: line 4: 5: command not found piHoleVersion: line 4: 2m: command not found piHoleVersion: line 7: 5: command not found piHoleVersion: line 7: 1m: command not found piHoleVersion: line 10: 5: command not found piHoleVersion: line 10: 2m: command not found piHoleVersion: line 13: 5: command not found piHoleVersion: line 13: 2m: command not found piHoleVersion: line 15: 5: command not found piHoleVersion: line 15: 2m: command not found for reference, these are the contents of line 4, 7, 10, 13 and 15 - core_version_heatmap=^[[38;5;2m web_version_heatmap=^[[38;5;1m ftl_version_heatmap=^[[38;5;2m padd_version_heatmap=^[[38;5;2m version_heatmap=^[[38;5;2m So now, as suggested by @dschaper in [1], we use hardcoded ANSI escape codes that are guaranteed to work with ISO 6429 compatible terminals. [1]: #171 (comment),
Fix command-not-found messages on rxvt-unicode
Signed-off-by: Christian König <[email protected]>
Version bump 3.6.7
…nings - removed some 'referenced but not assigned' variables - removed some 'appears unused variables - disabled a single SC2059 because it appears to be a false positive
Co-authored-by: yubiuser <[email protected]>
Co-authored-by: yubiuser <[email protected]>
Co-authored-by: yubiuser <[email protected]>
Fix Issue 188 by enabling and fixing SC2034 and SC2154 shellcheck warnings
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.