Skip to content

Updated pandoc-citeproc handling after downloading #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2022
Merged

Updated pandoc-citeproc handling after downloading #311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions pypandoc/pandoc_download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,10 @@ def _handle_linux(filename, targetfolder):
exe = "pandoc-citeproc"
src = os.path.join(tempfolder, "usr", "bin", exe)
dst = os.path.join(targetfolder, exe)
logger.info(f"Copying {exe} to {targetfolder} ...")
try:
if os.path.exists(src):
logger.info(f"Copying {exe} to {targetfolder} ...")
shutil.copyfile(src, dst)
_make_executable(dst)
except FileNotFoundError:
logger.exception("Didn't copy pandoc-citeproc")
src = os.path.join(tempfolder, "usr", "share", "doc", "pandoc", "copyright")
dst = os.path.join(targetfolder, "copyright.pandoc")
logger.info(f"Copying copyright to {targetfolder} ...")
Expand Down Expand Up @@ -151,12 +149,10 @@ def _handle_darwin(filename, targetfolder):
exe = "pandoc-citeproc"
src = os.path.join(pkgutilfolder, "usr", "local", "bin", exe)
dst = os.path.join(targetfolder, exe)
logger.info(f"Copying {exe} to {targetfolder} ...")
try:
if os.path.exists(src):
logger.info(f"Copying {exe} to {targetfolder} ...")
shutil.copyfile(src, dst)
_make_executable(dst)
except FileNotFoundError:
logger.exception("Didn't copy pandoc-citeproc")

# remove temporary dir
shutil.rmtree(tempfolder)
Expand All @@ -183,11 +179,9 @@ def _handle_win32(filename, targetfolder):
exe = "pandoc-citeproc.exe"
src = os.path.join(tempfolder, "Pandoc", exe)
dst = os.path.join(targetfolder, exe)
logger.info(f"Copying {exe} to {targetfolder} ...")
try:
if os.path.exists(src):
logger.info(f"Copying {exe} to {targetfolder} ...")
shutil.copyfile(src, dst)
except FileNotFoundError:
logger.exception("Didn't copy pandoc-citeproc.exe")

exe = "COPYRIGHT.txt"
src = os.path.join(tempfolder, "Pandoc", exe)
Expand Down