bigfix: parsing --ttf parameter in birdfont-export

Changed files (3)

• modified src/Birdfont.vala
• modified src/ExportTool.vala
• modified win32/wscript

Diff

diff --git a/src/Birdfont.vala b/src/Birdfont.valaindex 4bc358b..6468dd9 100644--- a/src/Birdfont.vala+++ b/src/Birdfont.vala@@ -156,35 +156,32 @@ public static int run_export (string[] arg) { 			return 0; 		} 		-		if (arg[i] == "-o" || arg[i] == "--output" && i + 1 < arg.length) {+		if ((arg[i] == "-o" || arg[i] == "--output") && i + 1 < arg.length) { 			output_directory = arg[i + 1]; 			i++; 			continue; 		} -		if (arg[i] == "-t" || arg[i] == "--ttf") {-			write_ttf = true;+		if (arg[i] == "-s" || arg[i] == "--svg") {+			write_svg = true; 			specific_formats = true;-			i++; 			continue; 		}--		if (arg[i] == "-s" || arg[i] == "--svg") {-			write_svg = true;+		+		if (arg[i] == "-t" || arg[i] == "--ttf") {+			write_ttf = true; 			specific_formats = true;-			i++; 			continue; 		} 		 		if (arg[i].has_prefix ("-")) { 			print_export_help (arg); 			return 1;-			continue; 		} 		 		if (!arg[i].has_prefix ("-")) { 			file_name = arg[i];-			+						 			if (i != arg.length - 1) { 				print_export_help (arg); 				return 1;diff --git a/src/ExportTool.vala b/src/ExportTool.valaindex 1e8559d..035f4ad 100644--- a/src/ExportTool.vala+++ b/src/ExportTool.vala@@ -443,7 +443,6 @@ os.put_string ( 					export_command = @"$(get_birdfont_export ()) --ttf -o $((!) folder.get_path ()) $temp_file"; 					 					try {-						print (@"Execute \"$export_command\" \n"); 						Process.spawn_command_line_async (export_command); 					} catch (Error e) { 						stderr.printf (@"Failed to execute \"$export_command\" \n");diff --git a/win32/wscript b/win32/wscriptindex 7e991e5..a6d374e 100644--- a/win32/wscript+++ b/win32/wscript@@ -210,6 +210,9 @@ Section "Birdfont (required)" 	write_files ('.', f)  	f.write("""++  SetOutPath $INSTDIR+   ; Write the installation path into the registry   WriteRegStr HKLM SOFTWARE\NSIS_Birdfont "Install_Dir" "$INSTDIR"