From c9e8b2970b87f54be258d896545b8173f4e45db0 Mon Sep 17 00:00:00 2001 From: Martin Carlberg Date: Mon, 4 Oct 2021 12:51:12 +0200 Subject: [PATCH] Fixed: Moved out nib2cib functions to correct scope so they can be accessed by `catch` --- Tools/nib2cib/Converter.j | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Tools/nib2cib/Converter.j b/Tools/nib2cib/Converter.j index 40de801cb..1953bf3b8 100644 --- a/Tools/nib2cib/Converter.j +++ b/Tools/nib2cib/Converter.j @@ -120,6 +120,25 @@ ConverterConversionException = @"ConverterConversionException"; var temporaryNibFilePath = "", temporaryPlistFilePath = ""; + + function isReadable(p) { + try { + fs.accessSync(p, fs.constants.R_OK); + return true; + } catch (err) { + return false; + } + } + + function isWritable(p) { + try { + fs.accessSync(p, fs.constants.W_OK); + return true; + } catch (err) { + return false; + } + } + try { var tmpdir = fs.mkdtempSync(path.join(os.tmpdir(), 'nib2cib-')); @@ -169,24 +188,6 @@ ConverterConversionException = @"ConverterConversionException"; p.stderr.close(); } */ - function isReadable(p) { - try { - fs.accessSync(p, fs.constants.R_OK); - return true; - } catch (err) { - return false; - } - } - - function isWritable(p) { - try { - fs.accessSync(p, fs.constants.W_OK); - return true; - } catch (err) { - return false; - } - } - if (!isReadable(temporaryPlistFilePath)) [CPException raise:ConverterConversionException reason:@"Unable to convert nib file."];