From 2952a274e4be15e5bfcf41e8851ffa09b7d0e3eb Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Sat, 4 Apr 2020 15:37:29 +0200 Subject: [PATCH] Fix zip creation --- file_setup | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/file_setup b/file_setup index f49e815..93e0d6c 100755 --- a/file_setup +++ b/file_setup @@ -37,11 +37,15 @@ def merge_images(input_dir, output_dir, output_file_base, zip): cmd = 'rm "{}"/file_list.txt'.format(input_dir) subprocess.run(cmd, shell=True) if zip is not None: + # Remove .zip file extension if provided + if zip.endswith('.zip'): + zip = zip[:-4] + zip = zip if zip else 'output' cmd = 'cd "{}"'.format(output_dir) cmd += ' && ' cmd += 'zip' cmd += ' -m' - cmd += ' "{}"_-_pdf "{}".pdf'.format(zip, output_file_base) + cmd += ' "{}" "{}".pdf'.format(zip, output_file_base) cmd += ' && ' cmd += 'cd -' subprocess.run(cmd, shell=True)