CR feedback

This commit is contained in:
Dan Quirk 2016-04-04 21:15:39 +00:00 committed by Daniel Quirk
parent b3495e3322
commit 7a79a16c8d
2 changed files with 7 additions and 7 deletions

View file

@ -158,6 +158,7 @@ create_empty_debian_layout(){
mkdir "$PACKAGE_LAYOUT_DIR/package_root" mkdir "$PACKAGE_LAYOUT_DIR/package_root"
mkdir "$PACKAGE_LAYOUT_DIR/samples" mkdir "$PACKAGE_LAYOUT_DIR/samples"
mkdir "$PACKAGE_LAYOUT_DIR/docs" mkdir "$PACKAGE_LAYOUT_DIR/docs"
mkdir "$PACKAGE_LAYOUT_DIR/debian"
} }
copy_files_to_debian_layout(){ copy_files_to_debian_layout(){
@ -177,7 +178,7 @@ copy_files_to_debian_layout(){
for manpage in "$PACKAGE_LAYOUT_DIR/docs/"*; do mv "$manpage" "${manpage}-${DOTNET_CLI_VERSION}.1"; done for manpage in "$PACKAGE_LAYOUT_DIR/docs/"*; do mv "$manpage" "${manpage}-${DOTNET_CLI_VERSION}.1"; done
# Copy postinstall # Copy postinstall
cp "$PACKAGING_ROOT/postinst" "$PACKAGE_LAYOUT_DIR/$" cp "$PACKAGING_ROOT/postinst" "$PACKAGE_LAYOUT_DIR/debian/postinst"
} }
create_debian_package(){ create_debian_package(){

View file

@ -152,9 +152,7 @@ package_all(){
package_absolute_placement package_absolute_placement
package_samples package_samples
package_docs package_docs
if [[ $PACKAGE_NAME == "dotnet-dev-"* ]]; then package_install_scripts
package_debian
fi
} }
generate_all(){ generate_all(){
@ -219,9 +217,10 @@ package_docs(){
fi fi
} }
package_debian(){ package_install_scripts(){
if [[ -d "$ABSOLUTE_PLACEMENT_DIR" ]]; then # copy scripts for the package's control section like preinst, postint, etc
cp "$ABSOLUTE_PLACEMENT_DIR/postinst" $DEBIAN_DIR/postinst if [[ -d "$INPUT_DIR/debian" ]]; then
cp -a "$INPUT_DIR/debian/." $DEBIAN_DIR
fi fi
} }