added windows gpg exe path, added gpg command
This commit is contained in:
@@ -30,6 +30,7 @@ datetime_string = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
|
||||
|
||||
if os_detected == "Windows":
|
||||
bitwarden_cli_executable = os.path.join(script_directory, "lib", "Bitwarden CLI", "bw.exe")
|
||||
gpg_executable = os.path.join(script_directory, "lib", "gpg", "bin", "gpg.exe")
|
||||
elif os_detected == "Linux":
|
||||
bitwarden_cli_executable = os.path.join(script_directory, "lib", "Bitwarden CLI", "bw_linux")
|
||||
elif os_detected == "macOS":
|
||||
@@ -494,12 +495,14 @@ if __name__ == "__main__":
|
||||
logger.info("Zipping everything together...")
|
||||
zip_filename = os.path.join(exports_directory, "Bitwarden Backup {} {}".format(email, datetime_string))
|
||||
shutil.make_archive(zip_filename, format="zip", root_dir=working_directory)
|
||||
|
||||
|
||||
logger.debug((subprocess.run([gpg_executable, '--no-options', '--batch', '--passphrase', vault_password, '--symmetric', '--cipher-algo', 'AES256', '--digest-algo', 'SHA512', '--compression-algo', 'Uncompressed', '--output', zip_filename + '.zip.gpg', zip_filename + '.zip'], capture_output=True).stderr).decode())
|
||||
|
||||
logger.info("Securely deleting files")
|
||||
secure_delete.secure_delete(working_directory)
|
||||
#secure_delete.secure_delete(zip_filename)
|
||||
secure_delete.secure_delete(zip_filename + ".zip")
|
||||
logger.info("Removing working directory")
|
||||
shutil.rmtree(working_directory)
|
||||
#shutil.rmtree(working_directory)
|
||||
|
||||
else:
|
||||
logger.error("Unable to unlock vault, please check vault password")
|
||||
|
||||
Reference in New Issue
Block a user