diff --git a/package_tool/README.md b/package_tool/README.md index d42668652..c94686bb9 100644 --- a/package_tool/README.md +++ b/package_tool/README.md @@ -59,6 +59,6 @@ Note: remove all comments before using this }, "symlinks": { // (optional no defaults) - "path_relative_to_package_root/test_exe.sh" : "/usr/bin/test_exe.sh" + "path_relative_to_package_root/test_exe.sh" : "usr/bin/test_exe.sh" } } \ No newline at end of file diff --git a/package_tool/example_config.json b/package_tool/example_config.json index acffec7ac..2c048ba9d 100644 --- a/package_tool/example_config.json +++ b/package_tool/example_config.json @@ -34,6 +34,6 @@ }, "symlinks": { // (optional no defaults) - "path_relative_to_package_root/test_exe.sh" : "/usr/bin/test_exe.sh" + "path_relative_to_package_root/test_exe.sh" : "usr/bin/test_exe.sh" } } \ No newline at end of file diff --git a/package_tool/scripts/config_template_generator.py b/package_tool/scripts/config_template_generator.py index fb7a8fead..85c329742 100644 --- a/package_tool/scripts/config_template_generator.py +++ b/package_tool/scripts/config_template_generator.py @@ -14,7 +14,7 @@ FILE_CONTROL = 'control' FILE_COPYRIGHT = 'copyright' FILE_SYMLINK_FORMAT = '{package_name}.links' -PACKAGE_ROOT_FORMAT = "/usr/share/{package_name}" +PACKAGE_ROOT_FORMAT = "usr/share/{package_name}" CHANGELOG_DATE_FORMAT = "%a, %d %b %Y %H:%M:%S %z" # UTC Timezone for Changelog date @@ -206,7 +206,6 @@ def parse_and_validate_args(): help_and_exit("Error: Invalid template directory path") if not os.path.isdir(output_dir): - print output_dir #TODO debug help_and_exit("Error: Invalid output directory path") return (config_path, template_dir, output_dir) diff --git a/package_tool/scripts/manpage_generator.py b/package_tool/scripts/manpage_generator.py index b2ead05f4..5ad77de6a 100644 --- a/package_tool/scripts/manpage_generator.py +++ b/package_tool/scripts/manpage_generator.py @@ -105,7 +105,6 @@ def generate_synopsis_section(tool_name, tool_data):# roff_text_builder = [] roff_text_builder.append(".SH SYNOPSIS") - #TODO: append ellipsis conditionally if argument_list_name is added synopsis_format = '.B {program_name} {command_name} \n.RI {options} " "\n.I "{argument_list_name}"' tool_commands = tool_data.get("commands", []) diff --git a/package_tool/test/test_assets/test_package_layout/debian_config.json b/package_tool/test/test_assets/test_package_layout/debian_config.json index 23a6eb139..db873c716 100644 --- a/package_tool/test/test_assets/test_package_layout/debian_config.json +++ b/package_tool/test/test_assets/test_package_layout/debian_config.json @@ -35,6 +35,6 @@ }, "symlinks": { - "path_relative_to_package_root/test_exe.sh" : "/usr/bin/test_exe.sh" + "path_relative_to_package_root/test_exe.sh" : "usr/bin/test_exe.sh" } } \ No newline at end of file