From a82bd281a72f1b1064b2124f390f4da10a49b1cc Mon Sep 17 00:00:00 2001 From: Yuxin Wu Date: Fri, 26 Jun 2020 19:01:18 -0700 Subject: [PATCH] sqlcipher compatibilty --- android-interact.sh | 2 +- dump-html.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/android-interact.sh b/android-interact.sh index b581289..0be1601 100755 --- a/android-interact.sh +++ b/android-interact.sh @@ -55,7 +55,7 @@ elif [[ $1 == "db" || $1 == "res" ]]; then echo "Pulling resources... " for d in avatar image2 voice2 emoji video sfs; do adb shell "cd $RES_DIR/$chooseUser && - busybox tar czf - $d 2>/dev/null | busybox base64" | + tar czf - $d 2>/dev/null | base64" | base64 -di | tar xzf - # Old Slow Way: diff --git a/dump-html.py b/dump-html.py index c60d3ad..8a39d69 100755 --- a/dump-html.py +++ b/dump-html.py @@ -49,6 +49,8 @@ if __name__ == '__main__': with open(output_file, 'w') as f: print >> f, htmls[0].encode('utf-8') else: + assert output_file.endswith(".html") + basename = output_file[:-5] for idx, html in enumerate(htmls): - with open(output_file + '.{}'.format(idx), 'w') as f: + with open(basename + '.{}'.format(idx) + '.html', 'w') as f: print >> f, html.encode('utf-8')