From 9339c22a5cbab766fb4b028dcbcad7cac17393db Mon Sep 17 00:00:00 2001 From: Bryan Thornbury Date: Thu, 29 Oct 2015 13:55:06 -0700 Subject: [PATCH] tweak to debian_build_lib and up version number of package --- debian_config.json | 2 +- package_tool/scripts/debian_build_lib.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian_config.json b/debian_config.json index bd8f0bd1e..d77dbd05b 100644 --- a/debian_config.json +++ b/debian_config.json @@ -9,7 +9,7 @@ "homepage": "https://dotnet.github.io/core", "release":{ - "package_version":"0.3", + "package_version":"0.200", "package_revision":"1", "urgency" : "low", "changelog_message" : "Bootstrap loop package" diff --git a/package_tool/scripts/debian_build_lib.sh b/package_tool/scripts/debian_build_lib.sh index eb51f0b93..14ddbc35a 100644 --- a/package_tool/scripts/debian_build_lib.sh +++ b/package_tool/scripts/debian_build_lib.sh @@ -42,6 +42,11 @@ add_system_dir_placement(){ abs_installation_dir=$2 dir_files=( $(_get_files_in_dir_tree $PACKAGE_SOURCE_DIR/$in_package_dir) ) + + # If in_package_dir isn't empty include a slash + if [ ! -z "$in_package_dir" ]; then + in_package_dir="${in_package_dir}/" + fi for rel_filepath in ${dir_files[@]} do @@ -49,9 +54,9 @@ add_system_dir_placement(){ # If there is no parent, parent_path = "." if [[ "$parent_path" == "." ]]; then - add_system_file_placement "${in_package_dir}/${rel_filepath}" "${abs_installation_dir}" + add_system_file_placement "${in_package_dir}${rel_filepath}" "${abs_installation_dir}" else - add_system_file_placement "${in_package_dir}/${rel_filepath}" "${abs_installation_dir}/${parent_path}" + add_system_file_placement "${in_package_dir}${rel_filepath}" "${abs_installation_dir}/${parent_path}" fi done