GonnaHetzMe/palera1n
1
0 Fork 0
mirror of https://github.com/palera1n/palera1n.git synced 2026-10-23 10:39:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge tui! (#409)

Browse Source 
* Merge main into tui (#406)

* plooshInit support

* Add override libcheckra1nhelper option

* update credits.c

* Update build.yml

---------

Co-authored-by: Nick Chan <[email protected]>
Co-authored-by: meow <[email protected]>

* Add TUI

* ISO C forbids an empty translation unit

* Default to TUI

* thanks iPadOS

* I forgot

* make random quotes more related (#408)

Definitely a good concept of the TUI (and one that I am a fan of), but (as has been somewhat brought up by others) we should probably make them more related to checkm8, checkra1n, or palera1n (since those are the types of things that this tool is based off of)

* "Connect your iPhone, iPad, iPod Touch, or Apple TV"

* Add Linux TTY support

* DIsable TUI for certain options

* Fix boot-args overflow

* auto reposition cursor

* Moved droplet, no one could behave

* Move the droplet back because it actually made it worse

---------

Co-authored-by: Nick Chan <[email protected]>
Co-authored-by: meow <[email protected]>
Co-authored-by: Michael <[email protected]>
Co-authored-by: Samara <[email protected]>
This commit is contained in:
HAHALOSAHNick ChanmeowMichaelSamara
 authored and GitHub committed 2024-03-27 22:50:45 -07:00
1 parent 5dd2980e96
commit e332a00cf9
19 files changed
+2314 -182
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/optparse.c
+39 -3
View File
@@ -14,6 +14,9 @@
#include <palerain.h>
#include <sys/mman.h>
#include <inttypes.h>
#ifdef TUI
#include <tui.h>
#endif
uint64_t* palerain_flags_p = &palerain_flags;
static bool force_use_verbose_boot = false;
@@ -53,6 +56,7 @@ static struct option longopts[] = {
#endif
#ifdef TUI
{"tui", no_argument, NULL, 't'},
{"cli", no_argument, NULL, palerain_option_case_cli},
#endif
{NULL, 0, NULL, 0}
};
@@ -96,7 +100,9 @@ static int usage(int e, char* prog_name)
"\t-i, --override-checkra1n <file>\t\tOverride checkra1n\n"
"\t-k, --override-pongo <file>\t\tOverride Pongo image\n"
"\t-K, --override-kpf <file>\t\tOverride kernel patchfinder\n"
#ifdef ROOTFUL
"\t-l, --rootless\t\t\t\tBoots rootless. This is the default\n"
#endif
"\t-L, --jbinit-log-to-file\t\tMake jbinit log to /cores/jbinit.log (can be read from sandbox while jailbroken)\n"
"\t-n, --exit-recovery\t\t\tExit recovery mode\n"
"\t-I, --device-info\t\t\tPrint info about the connected device\n"
@@ -112,7 +118,8 @@ static int usage(int e, char* prog_name)
"\t-V, --verbose-boot\t\t\tVerbose boot\n"
#ifdef TUI
"\t-t, --tui\t\t\t\tTerminal user interface\n"
"\t-t, --tui\t\t\t\tForce interactive TUI\n"
"\t--cli\t\t\t\tForce cli mode\n"
#endif
"\nEnvironmental variables:\n"
"\tTMPDIR\t\ttemporary diretory (path the built-in checkra1n will be extracted to)\n"
@@ -163,6 +170,9 @@ int optparse(int argc, char* argv[]) {
case 'V':
palerain_flags |= palerain_option_verbose_boot;
force_use_verbose_boot = true;
#ifdef TUI
tui_options_verbose_boot = true;
#endif
break;
case 'e':
if (strstr(optarg, "rootdev=") != NULL) {
@@ -173,6 +183,9 @@ int optparse(int argc, char* argv[]) {
return -1;
}
snprintf(xargs_cmd, sizeof(xargs_cmd), "xargs %s", optarg);
#ifdef TUI
snprintf(tui_options_boot_args, sizeof(tui_options_boot_args), "%s", optarg);
#endif
break;
case 'f':
palerain_flags |= palerain_option_rootful;
@@ -193,6 +206,9 @@ int optparse(int argc, char* argv[]) {
break;
case 's':
palerain_flags |= palerain_option_safemode;
#ifdef TUI
tui_options_safe_mode = true;
#endif
break;
case 'k':
if (access(optarg, F_OK) != 0) {
@@ -286,6 +302,9 @@ int optparse(int argc, char* argv[]) {
case 't':
palerain_flags |= palerain_option_tui;
break;
case palerain_option_case_cli:
palerain_flags |= palerain_option_cli;
break;
#endif
#ifdef DEV_BUILD
case '1':
@@ -297,6 +316,9 @@ int optparse(int argc, char* argv[]) {
#endif
case palerain_option_case_force_revert:
palerain_flags |= palerain_option_force_revert;
#ifdef TUI
tui_options_force_revert = true;
#endif
break;
case palerain_option_case_version:
palerain_flags |= palerain_option_palerain_version;
@@ -336,10 +358,24 @@ int optparse(int argc, char* argv[]) {
palerain_flags &= ~palerain_option_verbose_boot;
}
if ((palerain_flags & (palerain_option_rootless | palerain_option_rootful)) == 0) {
LOG(LOG_FATAL, "must specify -l option");
if ((palerain_flags & (palerain_option_tui)) && (palerain_flags & (palerain_option_cli))) {
LOG(LOG_FATAL, "cannot specify both --tui and --cli");
return -1;
}
if ((palerain_flags & (palerain_option_exit_recovery | palerain_option_enter_recovery | palerain_option_reboot_device | palerain_option_device_info | palerain_option_dfuhelper_only | palerain_option_pongo_exit | palerain_option_pongo_full)) > 0) {
palerain_flags &= ~palerain_option_tui;
palerain_flags |= palerain_option_cli;
} else {
#ifdef ROOTFUL
if ((palerain_flags & (palerain_option_rootless | palerain_option_rootful)) == 0) {
LOG(LOG_FATAL, "must specify -l option");
return -1;
}
#else
palerain_flags |= palerain_option_rootless;
#endif
}
snprintf(palerain_flags_cmd, 0x30, "palera1n_flags 0x%" PRIx64, palerain_flags);
LOG(LOG_VERBOSE3, "palerain_flags: %s", palerain_flags_cmd);