Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de034ec8 authored by Christopher Tate's avatar Christopher Tate
Browse files

Change default backup filename and terminology 

We now use "backup.ab" as the default backup archive filename, and no longer
refer to "tar" or "tarfiles" in the help text.  The underlying format may
be tar, but we're certainly not interoperable even with ustar/pax thanks
to our compression & encryption layers and our custom header.

Change-Id: I3e74af96cfc102e94848c969eb36af54304bfd9b
parent a2468719

adb/commandline.c

+5 −5
Original line number Diff line number Diff line
@@ -130,11 +130,11 @@ void help() 
        "                                 that should be included in a bug report.\n"

        "\n"

        "  adb backup [-f <file>] [-apk|-noapk] [-shared|-noshared] [-all] [<packages...>]\n"

        "                               - Write a tarfile backup of the device's data to <file>.\n"

        "                               - Write an archive of the device's data to <file>.\n"

        "                                 If a -f option is not supplied then the data is\n"

        "                                 written to \"backup.tar\" in the current directory.\n"

        "                                 written to \"backup.ab\" in the current directory.\n"

        "                                 (-apk|-noapk enable/disable backup of the .apks themselves\n"

        "                                    in the tarfile; the default is noapk.)\n"

        "                                    in the archive; the default is noapk.)\n"

        "                                 (-shared|-noshared enable/disable backup of the device's\n"

        "                                    shared storage / SD card contents; the default is noshared.)\n"

        "                                 (-all means to back up all installed applications)\n"
@@ -142,7 +142,7 @@ void help() 
        "                                    the -all or -shared flags are passed, then the package\n"

        "                                    list is optional.)\n"

        "\n"

        "  adb restore <file>           - restore device contents from the <file> backup tarfile\n"

        "  adb restore <file>           - restore device contents from the <file> backup archive\n"

        "\n"

        "  adb help                     - show this help message\n"

        "  adb version                  - show version num\n"
@@ -575,7 +575,7 @@ static int logcat(transport_type transport, char* serial, int argc, char **argv) 


static int backup(int argc, char** argv) {

    char buf[4096];

    const char* filename = "./backup.tar";

    const char* filename = "./backup.ab";

    int fd, outFd;

    int i, j;