diff options
| -rwxr-xr-x | dh_cligacpolicy | 7 | ||||
| -rwxr-xr-x | dh_clistrip | 6 | ||||
| -rwxr-xr-x | dh_installcliframework | 10 | ||||
| -rwxr-xr-x | dh_installcligac | 10 | ||||
| -rwxr-xr-x | dh_makeclilibs | 6 |
5 files changed, 13 insertions, 26 deletions
diff --git a/dh_cligacpolicy b/dh_cligacpolicy index f823a4e..5d264dd 100755 --- a/dh_cligacpolicy +++ b/dh_cligacpolicy @@ -194,12 +194,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) close POLICY; # Make sure the policies.d directory exists - if (! -d "$tmp/usr/share/cli-common/policies.d") { - doit("install","-d","$tmp/usr/share/cli-common/policies.d"); - } - if (! -d "$tmp/usr/share/cli-common/policies.d/$package") { - doit("install","-d","$tmp/usr/share/cli-common/policies.d/$package"); - } + install_dir("$tmp/usr/share/cli-common/policies.d/$package"); # Once all the various <assemblyBinding> tags are consolidated, we # then generate the policy files. This will result in one policy file for diff --git a/dh_clistrip b/dh_clistrip index 85afe68..635e9b8 100755 --- a/dh_clistrip +++ b/dh_clistrip @@ -80,14 +80,12 @@ foreach my $package (@{$dh{DOPACKAGES}}) { verbose_print("debug_dir: $debug_dir"); $debug_dir = $pwd . "/debian/$debug_pkg/" . $debug_dir; verbose_print("debug_dir: $debug_dir"); - if (! -d $debug_dir) { - doit("install", "-d", $debug_dir); - } + install_dir($debug_dir); verbose_print("moving $file to $debug_dir"); doit("mv", $file, $debug_dir); } else { verbose_print("deleting $file"); - doit("rm", $file); + rm_files($file); } }, $tmp); } diff --git a/dh_installcliframework b/dh_installcliframework index 91465cc..1d6f5f0 100755 --- a/dh_installcliframework +++ b/dh_installcliframework @@ -141,16 +141,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } close CLIFRAMEWORK; - if (! -d "$tmp/usr/share/cli-common/packages.d") { - doit("install","-d","$tmp/usr/share/cli-common/packages.d"); - } - doit("install", "-m0644", $cliframework, "$tmp/usr/share/cli-common/packages.d/$package.installcliframework"); + install_dir("$tmp/usr/share/cli-common/packages.d"); + install_file($cliframework, "$tmp/usr/share/cli-common/packages.d/$package.installcliframework"); if (! $dh{NOSCRIPTS}) { autoscript($package, "postinst", "postinst-cliframework", - "s/#PACKAGE#/$package/"); + { 'PACKAGE' => $package }); autoscript($package, "prerm", "prerm-cliframework", - "s/#PACKAGE#/$package/"); + { 'PACKAGE' => $package }); } } } diff --git a/dh_installcligac b/dh_installcligac index 0d72796..ec04eba 100755 --- a/dh_installcligac +++ b/dh_installcligac @@ -63,16 +63,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) { } close CLIGAC; - if (! -d "$tmp/usr/share/cli-common/packages.d") { - doit("install","-d","$tmp/usr/share/cli-common/packages.d"); - } - doit("install", "-m0644", $cligac, "$tmp/usr/share/cli-common/packages.d/$package.installcligac"); + install_dir("$tmp/usr/share/cli-common/packages.d"); + install_file($cligac, "$tmp/usr/share/cli-common/packages.d/$package.installcligac"); if (! $dh{NOSCRIPTS}) { autoscript($package, "postinst", "postinst-cligac", - "s/#PACKAGE#/$package/"); + { 'PACKAGE' => $package }); autoscript($package, "prerm", "prerm-cligac", - "s/#PACKAGE#/$package/"); + { 'PACKAGE' => $package }); } } } diff --git a/dh_makeclilibs b/dh_makeclilibs index 8326716..1d691cb 100755 --- a/dh_makeclilibs +++ b/dh_makeclilibs @@ -172,7 +172,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { my %seen; my $need_ldconfig = 0; - doit("rm", "-f", "$tmp/DEBIAN/clilibs"); + rm_files("$tmp/DEBIAN/clilibs"); if (-e "debian/$package.clilibs" ) { complex_doit("cat debian/$package.clilibs > $tmp/DEBIAN/clilibs"); } else { @@ -233,9 +233,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) { return; } - if (!-d "$tmp/DEBIAN") { - doit("install", "-d", "$tmp/DEBIAN"); - } my $deps = $package; # Call isnative becuase it sets $dh{VERSION} @@ -283,6 +280,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) { # if ( my $extra = extraDeps ($libfile) ) { $line .= ", $extra"; } if (!$seen{$line}) { $seen{$line} = 1; + install_dir("$tmp/DEBIAN"); complex_doit("echo '$line' >> $tmp/DEBIAN/clilibs"); } } |