Add cli support #44
Add cli support #44
Conversation
usr/lib/tik/modules/pre/15-encrypt
Outdated
| @@ -61,7 +61,7 @@ encrypt_notification() { | |||
| # Secureboot being disabled makes the notification a Yes/No with the preference being to exit | |||
| if [ "${secureboot_disabled}" == 1 ]; then | |||
| log "[encrypt_notification] secureboot warning shown" | |||
| zenity --width=600 --question --icon=security-low-symbolic --title="Warning" --ok-label="Cancel Installation" --cancel-label="I Understand, Proceed Anyway" --text="${preamble}\n\nReason: <b>SecureBoot Disabled</b> and ${reason}\n\n${secureboot_warning}" && exit 1 | |||
| d --width=600 --question --icon=security-low-symbolic --title="Warning" --ok-label="Cancel Installation" --cancel-label="I Understand, Proceed Anyway" --text="${preamble}\n\nReason: <b>SecureBoot Disabled</b> and ${reason}\n\n${secureboot_warning}" && exit 1 | |||
There was a problem hiding this comment.
This will not work. The reason it's structured like this is so the zenity's right most (default) button will be 'Cancel Installation' and the left most (normally cancel) button will be 'I Understand, Proceed Anyway.
d will interpret the 'Cancel' as a failure, as abort tik. Whereas the && exit 1 will also exit tik..so this is a functional dead end :)
I guess we need an some kind of flag/variant of d that removes the return code checking so we can preserve this behaviour while working better with cenity (love the name btw)
Maybe d-opt the same way we have prun-opt which does the same for prun as we now need for d
Dont' think this problem is serious enough to block merging, but will need to be addressed before the next tik release.
usr/lib/tik/modules/pre/20-mig
Outdated
| @@ -10,7 +10,7 @@ fi | |||
|
|
|||
| if [ ! -z "$(ls -A ${mig_dir})" ]; then | |||
| log "existing backup found" | |||
| zenity --question --no-wrap --cancel-label="No, Delete Backup" --title="Existing user backup detected" --text="These users can be restored to the new installation\n\nWould you like to use this backup?" | |||
| d --question --no-wrap --cancel-label="No, Delete Backup" --title="Existing user backup detected" --text="These users can be restored to the new installation\n\nWould you like to use this backup?" | |||
There was a problem hiding this comment.
Same as the similar comment in 15-encrypt, needs a d-opt or similar function because we're relying on the non-0 return code to inform us that the backup needs to be deleted, not that we want to stop the install (the default behaviour of d)
| @@ -105,7 +109,7 @@ if [ -z "${skipbackup}" ]; then | |||
| if [ "${legacy_aeon}" == 1 ]; then | |||
| d --info --width=300 --height=300 --icon=distributor-logo-Aeon-symbolic --no-wrap --title="Message from the Aeon Team" --text="We'd like to thank you for adopting openSUSE Aeon so early in it's development,\nbefore we fully understood what we were building or how we wanted it to look\n\nWe are sorry that you need to reinstall your system\n\nThank you so much for your support.\nWe hope you enjoy the new look openSUSE Aeon" | |||
| fi | |||
| zenity --question --no-wrap --title="Backup users from the existing install?" --text="These users will be restored to the new installation." | |||
| d --question --no-wrap --title="Backup users from the existing install?" --text="These users will be restored to the new installation." | |||
There was a problem hiding this comment.
Same as the similar comment in 15-encrypt, needs a d-opt or similar function because we're relying on the non-0 return code to inform us that the user doesn't want to backup users not that we want to stop the install (the default behaviour of d)
usr/lib/tik/modules/post/15-encrypt
Outdated
| case $retval in | ||
| 0) | ||
| prun /usr/sbin/cryptsetup luksAddKey --key-file=${tik_keyfile} --batch-mode --force-password "${cryptpart}" <<<"${key}" | ||
| return 0 | ||
| ;; | ||
| 1|255) | ||
| zenity --question --text="Do you really want to quit?" && exit 1 | ||
| d --question --text="Do you really want to quit?" && exit 1 |
There was a problem hiding this comment.
This ends up being a forced abort of the install because if you click "No", informing the installer you dont want to exit, you end up triggering d's error handling that makes the installer think you want to exit.. :)
We really need that d-opt function mentioned in other comments :)
|
Indentation is 2 spaces instead of 4. Needs to be fixed |
usr/lib/tik/lib/cenity
Outdated
|
|
||
| c_key() { | ||
| echo -e "\tPress key to continue" | ||
| read |
There was a problem hiding this comment.
read -n 1 -s -r would be better here, plain read lets you type junk and needs an Enter to continue
greygoo
force-pushed
the
add_cli_support
branch
from
0ce04da
to
8ed8262
Compare
This PR adds a cenity function that will take options working with zenity to create terminal output similar to zenity dialogs.