sqlcipher compatibilty

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:

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')