From f0451c53231f49ac31c74cb0229d77339674721a Mon Sep 17 00:00:00 2001
From: Miguel Sousa <msousa@adobe.com>
Date: Tue, 19 Jun 2018 01:15:04 -0700
Subject: [PATCH] [makeotf] Ignore trailing slashes in input font path

Fixes #280
---
 Tests/makeotf_test.py                        | 12 ++++++++++++
 afdko/Tools/SharedData/FDKScripts/MakeOTF.py |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Tests/makeotf_test.py b/Tests/makeotf_test.py
index 039b9890c..478f45f70 100755
--- a/Tests/makeotf_test.py
+++ b/Tests/makeotf_test.py
@@ -3,6 +3,7 @@
 import os
 import platform
 import pytest
+from shutil import copytree
 import subprocess32 as subprocess
 import tempfile
 
@@ -85,3 +86,14 @@ def test_input_formats(arg, input_filename, otf_filename):
                    '    <checkSumAdjustment value=' + SPLIT_MARKER +
                    '    <created value=' + SPLIT_MARKER +
                    '    <modified value='])
+
+
+def test_ufo_with_trailing_slash_bug280():
+    # makeotf will now save the OTF alongside the UFO instead of inside of it
+    ufo_path = _get_input_path(UFO2_NAME)
+    temp_dir = tempfile.mkdtemp()
+    tmp_ufo_path = os.path.join(temp_dir, UFO2_NAME)
+    copytree(ufo_path, tmp_ufo_path)
+    runner(CMD + ['-n', '-a', '-o', 'f', '_{}{}'.format(tmp_ufo_path, os.sep)])
+    expected_path = os.path.join(temp_dir, 'SourceSansPro-Regular.otf')
+    assert os.path.isfile(expected_path)
diff --git a/afdko/Tools/SharedData/FDKScripts/MakeOTF.py b/afdko/Tools/SharedData/FDKScripts/MakeOTF.py
index aea3964e6..4dc9cbbb0 100755
--- a/afdko/Tools/SharedData/FDKScripts/MakeOTF.py
+++ b/afdko/Tools/SharedData/FDKScripts/MakeOTF.py
@@ -994,7 +994,7 @@ def getOptions(makeOTFParams):
         elif arg == kMOTFOptions[kInputFont][1]:
             kMOTFOptions[kInputFont][0] = i + optionIndex
             try:
-                file_path = args[i]
+                file_path = os.path.abspath(os.path.realpath(args[i]))
                 exec("makeOTFParams.%s%s = file_path" % (kFileOptPrefix,
                                                          kInputFont))
             except IndexError: