Add tui-sh #121
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |||||
| # SPDX-FileCopyrightText: 2024 3mdeb <contact@3mdeb.com> | ||||||
| # | ||||||
| # SPDX-License-Identifier: Apache-2.0 | ||||||
| # shellcheck disable=SC2034 | ||||||
|
|
||||||
| # shellcheck source=../include/dts-environment.sh | ||||||
| source $DTS_ENV | ||||||
|
|
@@ -11,47 +12,72 @@ source $DTS_FUNCS | |||||
| # shellcheck source=../include/dts-subscription.sh | ||||||
| source $DTS_SUBS | ||||||
|
|
||||||
|
Comment on lines
-14
to
-16
Contributor
There was a problem hiding this comment. Why have you deleted the traps?
Contributor
Author
There was a problem hiding this comment. tui-sh already traps 2 of those (except https://github.com/3mdeb/tui-sh/blob/24e778398c4fdc2c6be06ec271a1bb6737a426d2/lib/tui-lib.sh#L46 |
||||||
| # those won't change | ||||||
| DTS_VERSION=$(grep "VERSION_ID" ${OS_VERSION_FILE} | cut -d "=" -f 2-) | ||||||
|
Contributor
There was a problem hiding this comment. Why cant't wwe do it in |
||||||
| RAM_INFO="$(show_ram_inf)" | ||||||
| SHOW_DASHARO_FIRMWARE="true" | ||||||
| if check_if_dasharo; then | ||||||
| SHOW_TRANSITION="true" | ||||||
| SHOW_FUSE="true" | ||||||
| else | ||||||
| SHOW_TRANSITION="false" | ||||||
| SHOW_FALSE="false" | ||||||
|
Contributor
There was a problem hiding this comment. A typo?
Suggested change
|
||||||
| fi | ||||||
|
|
||||||
| set_menu_vars() { | ||||||
| DPP_IS_LOGGED=$(get_global_state DPP_IS_LOGGED) | ||||||
| export DPP_IS_LOGGED | ||||||
| DISPLAY_CREDENTIALS=$(get_global_state DISPLAY_CREDENTIALS) | ||||||
|
|
||||||
| if check_if_dasharo; then | ||||||
| DASHARO_FIRMWARE_LABEL="Update Dasharo Firmware" | ||||||
| else | ||||||
| DASHARO_FIRMWARE_LABEL="Install Dasharo Firmware" | ||||||
| fi | ||||||
| if [ "${SYSTEM_VENDOR}" != "QEMU" ] && [ "${SYSTEM_VENDOR}" != "Emulation" ]; then | ||||||
| SHOW_RESTORE_FIRMWARE="true" | ||||||
| else | ||||||
| SHOW_RESTORE_FIRMWARE="false" | ||||||
| fi | ||||||
|
|
||||||
| if [ "${DPP_IS_LOGGED}" = "true" ]; then | ||||||
| DPP_KEYS_LABEL="Edit your DPP keys" | ||||||
| else | ||||||
| DPP_KEYS_LABEL="Load your DPP keys" | ||||||
| fi | ||||||
| if systemctl is-active sshd &>/dev/null; then | ||||||
|
Contributor
There was a problem hiding this comment. We should add a function for |
||||||
| SSH_STATUS="$(tui_echo_green ON)" | ||||||
| SSH_IP="$(show_ssh_info)" | ||||||
| SSH_LABEL="stop SSH server" | ||||||
| SSH_ACTIVE="true" | ||||||
| else | ||||||
| SSH_LABEL="launch SSH server" | ||||||
| SSH_ACTIVE="false" | ||||||
| fi | ||||||
| SEND_LOGS_ACTIVE=$(get_global_state SEND_LOGS_ACTIVE) | ||||||
| export SEND_LOGS_ACTIVE | ||||||
| if [ "${SEND_LOGS_ACTIVE}" = "true" ]; then | ||||||
| SEND_LOGS_LABEL="disable sending DTS logs" | ||||||
| else | ||||||
| SEND_LOGS_LABEL="enable sending DTS logs" | ||||||
| fi | ||||||
|
|
||||||
| if [ "${DISPLAY_CREDENTIALS}" = "true" ]; then | ||||||
| DPP_EMAIL_DISPLAY=$(mc alias ls premium --json | jq -r '.accessKey') | ||||||
| DPP_PASSWORD_DISPLAY=$(mc alias ls premium --json | jq -r '.secretKey') | ||||||
| DISPLAY_CRED_LABEL="hide DPP credentials" | ||||||
| else | ||||||
| DPP_EMAIL_DISPLAY="***************" | ||||||
| DPP_PASSWORD_DISPLAY="***************" | ||||||
| DISPLAY_CRED_LABEL="display DPP credentials" | ||||||
| fi | ||||||
| if [ -f "${DPP_SUBMENU_JSON}" ]; then | ||||||
| SHOW_DTS_EXTENSIONS="true" | ||||||
| fi | ||||||
| } | ||||||
|
|
||||||
| tui_register_pre_render_callback subscription_routine | ||||||
| tui_register_pre_render_callback set_menu_vars | ||||||
| tui_register_pre_render_callback stop_trace_logging | ||||||
| tui_register_post_render_callback start_trace_logging | ||||||
| tui_run "$DTS_TUI_CONF" | ||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't we dynamically determine free file descriptor and use it? We must not hardcode anything.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We create it ourselves, so why not? What's the possible problematic scenario here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Race condition with other application for the hardcoded file descriptor.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be done in e.g.
dts-bootbut then we will have to keep separate state file perdts-boot(or at least pertty) so there is no race condition (which we might want to do anyway). This could probably be implemented better, as I think it won't work with multiline variables. I just needed some way to change variables from callbacks and this was quick workaround.