diff options
| -rw-r--r-- | orscmd/orscmd.cpp | 14 | ||||
| -rw-r--r-- | partitionmanager.cpp | 7 |
2 files changed, 10 insertions, 11 deletions
diff --git a/orscmd/orscmd.cpp b/orscmd/orscmd.cpp index c008450ab..fd8172dff 100644 --- a/orscmd/orscmd.cpp +++ b/orscmd/orscmd.cpp @@ -40,16 +40,14 @@ void print_usage(void) { printf("Allows command line usage of TWRP via openrecoveryscript commands.\n"); printf("Some common commands include:\n"); printf(" install /path/to/update.zip\n"); - printf(" backup BSDC backupname\n"); - printf(" restore backupname BSDC\n"); - printf(" factoryreset\n"); - printf(" wipe cache\n"); + printf(" backup <SDCRBAEM> [backupname]\n"); + printf(" restore <SDCRBAEM> [backupname]\n"); + printf(" wipe <partition name>\n"); printf(" sideload\n"); - printf(" set variable value\n"); - printf(" get variable\n"); - printf(" decrypt password\n"); + printf(" set <variable> [value]\n"); + printf(" decrypt <password>\n"); printf(" remountrw\n"); - printf("\nSee more documentation at http://teamw.in/openrecoveryscript\n"); + printf("\nSee more documentation at https://twrp.me/faq/openrecoveryscript.html\n"); } int do_setcap(const char* filename, const char* capabilities) diff --git a/partitionmanager.cpp b/partitionmanager.cpp index 0b9918d53..f53c2ae6e 100644 --- a/partitionmanager.cpp +++ b/partitionmanager.cpp @@ -1510,9 +1510,9 @@ void TWPartitionManager::Post_Decrypt(const string& Block_Device) { DataManager::SetValue("tw_storage_path", "/data/media/0"); DataManager::SetValue("tw_settings_path", "/data/media/0"); dat->UnMount(false); - Output_Partition(dat); } Update_System_Details(); + Output_Partition(dat); UnMount_Main_Partitions(); } else LOGERR("Unable to locate data partition.\n"); @@ -2509,7 +2509,7 @@ void TWPartitionManager::Decrypt_Adopted() { if (strcasecmp(GUID.c_str(), guid->value()) == 0) { xml_attribute<>* attr = volume->first_attribute("nickname"); - if (attr) { + if (attr && attr->value() && strlen(attr->value()) > 0) { (*adopt)->Storage_Name = attr->value(); (*adopt)->Display_Name = (*adopt)->Storage_Name; (*adopt)->Backup_Display_Name = (*adopt)->Storage_Name; @@ -2528,7 +2528,6 @@ void TWPartitionManager::Decrypt_Adopted() { Dat->Mount(false); (*adopt)->UnMount(false); (*adopt)->Mount(false); - Output_Partition((*adopt)); } } break; @@ -2537,6 +2536,8 @@ void TWPartitionManager::Decrypt_Adopted() { volume = volume->next_sibling("volume"); } } + Update_System_Details(); + Output_Partition((*adopt)); } } } |