diff --git a/.gitignore b/.gitignore index 085c4fe..9b810ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ *.pyc +*.sql +output/ +resource *.db diff --git a/decrypt_db.sh b/decrypt_db.sh index e5fb004..d819d94 100755 --- a/decrypt_db.sh +++ b/decrypt_db.sh @@ -1,6 +1,6 @@ #!/bin/bash -e # File: decrypt_db.sh -# Date: Sun Feb 01 17:30:29 2015 +0800 +# Date: Tue Jun 16 22:18:40 2015 +0800 # Author: Yuxin Wu source compatibility.sh @@ -33,9 +33,9 @@ echo "Dump decrypted database... " echo "Don't worry about libcrypt.so version warning." -SQLCIPHER=./sqlcipher/$os/$version +SQLCIPHER=./third-party/sqlcipher/$os/$version export LD_LIBRARY_PATH=$SQLCIPHER -$SQLCIPHER/sqlcipher $MSGDB << EOF +"$SQLCIPHER"/sqlcipher "$MSGDB" << EOF PRAGMA key='$KEY'; PRAGMA cipher_use_hmac = off; ATTACH DATABASE "$output" AS db KEY ""; diff --git a/sqlcipher/LICENSE b/third-party/sqlcipher/LICENSE similarity index 100% rename from sqlcipher/LICENSE rename to third-party/sqlcipher/LICENSE diff --git a/sqlcipher/README.md b/third-party/sqlcipher/README.md similarity index 100% rename from sqlcipher/README.md rename to third-party/sqlcipher/README.md diff --git a/sqlcipher/darwin/64bit/.libs/sqlite3 b/third-party/sqlcipher/darwin/64bit/.libs/sqlite3 similarity index 100% rename from sqlcipher/darwin/64bit/.libs/sqlite3 rename to third-party/sqlcipher/darwin/64bit/.libs/sqlite3 diff --git a/sqlcipher/darwin/64bit/sqlcipher b/third-party/sqlcipher/darwin/64bit/sqlcipher similarity index 100% rename from sqlcipher/darwin/64bit/sqlcipher rename to third-party/sqlcipher/darwin/64bit/sqlcipher diff --git a/sqlcipher/linux/32bit/libsqlcipher.so.0 b/third-party/sqlcipher/linux/32bit/libsqlcipher.so.0 similarity index 100% rename from sqlcipher/linux/32bit/libsqlcipher.so.0 rename to third-party/sqlcipher/linux/32bit/libsqlcipher.so.0 diff --git a/sqlcipher/linux/32bit/sqlcipher b/third-party/sqlcipher/linux/32bit/sqlcipher similarity index 100% rename from sqlcipher/linux/32bit/sqlcipher rename to third-party/sqlcipher/linux/32bit/sqlcipher diff --git a/sqlcipher/linux/64bit/libsqlcipher.so.0 b/third-party/sqlcipher/linux/64bit/libsqlcipher.so.0 similarity index 100% rename from sqlcipher/linux/64bit/libsqlcipher.so.0 rename to third-party/sqlcipher/linux/64bit/libsqlcipher.so.0 diff --git a/sqlcipher/linux/64bit/sqlcipher b/third-party/sqlcipher/linux/64bit/sqlcipher similarity index 100% rename from sqlcipher/linux/64bit/sqlcipher rename to third-party/sqlcipher/linux/64bit/sqlcipher