Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DietPi-Globals | G_WHIP_SCROLLBOX has been merged into G_WHIP_MSG #3240

Merged
merged 4 commits into from
Nov 22, 2019
Merged

DietPi-Globals | G_WHIP_SCROLLBOX has been merged into G_WHIP_MSG #3240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f3e717
v6.27
MichaIng Nov 22, 2019
3ca91c3
v6.27
MichaIng Nov 22, 2019
25e029c
v6.27
MichaIng Nov 22, 2019
f0f1f94
v6.27
MichaIng Nov 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dietpi/dietpi-bugreport
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ Would you like to send a bug report archive or remove an already uploaded one?';

elif (( $G_WHIP_RETURNED_VALUE == 3 )); then

G_WHIP_SCROLLBOX "The upload will contain the following command outputs:\n
G_WHIP_MSG "The upload will contain the following command outputs:\n
$(printf "\t- %s\n" "${aCOMMAND_LIST[@]}")\n
It will contain as well the following files and directories:\n
$(printf "\t- %s\n" "${aFILE_LIST[@]}")"
Expand Down
2 changes: 1 addition & 1 deletion dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15911,7 +15911,7 @@ List of installed software and their URL links for online docs:
done

G_WHIP_SIZE_X_MAX=70
G_WHIP_SCROLLBOX "$string"
G_WHIP_MSG "$string"
unset string

;;
Expand Down
4 changes: 2 additions & 2 deletions dietpi/func/dietpi-globals
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i '[d]ietpi')"; then
if (( ! $result )); then

G_WHIP_INIT
whiptail ${G_PROGRAM_NAME+--title "$G_PROGRAM_NAME | File viewer"} --backtitle "$WHIP_BACKTITLE" --textbox $fp_file --ok-button "$G_WHIP_BUTTON_OK_TEXT" $WHIP_SCROLLTEXT $WHIP_SIZE_Y $WHIP_SIZE_X
whiptail --title "${G_PROGRAM_NAME+$G_PROGRAM_NAME | }File viewer" --backtitle "$WHIP_BACKTITLE" --textbox $fp_file --ok-button "$G_WHIP_BUTTON_OK_TEXT" $WHIP_SCROLLTEXT $WHIP_SIZE_Y $WHIP_SIZE_X

fi

Expand Down Expand Up @@ -999,7 +999,7 @@ $(ps f -eo pid,user,tty,cmd | grep -i '[d]ietpi')"; then
G_DIETPI-NOTIFY 1 "$G_ERROR_HANDLER_COMMAND"

# Ask to report if it's one of our programs
[[ $G_PROGRAM_NAME && $G_ERROR_HANDLER_INFO_ONLY != 1 ]] && G_DIETPI-NOTIFY 2 "$print_report_to_dietpi_info"
[[ ${G_PROGRAM_NAME,,} == 'dietpi-'* && $G_ERROR_HANDLER_INFO_ONLY != 1 ]] && G_DIETPI-NOTIFY 2 "$print_report_to_dietpi_info"

# If interactive, prompt whip message
if (( $G_INTERACTIVE )); then
Expand Down