X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fcommon.sh;h=268c458085765822d722241835f3bff1a27cfa22;hp=ec105313bd8c662b44b30827830b64b0b5c20828;hb=3507a234b95476fe4ed3e6d7be685e4ffb2df576;hpb=2a9168df2bfed5c3353dfea956029a572d2a1e9b diff --git a/lib/common.sh b/lib/common.sh index ec10531..268c458 100644 --- a/lib/common.sh +++ b/lib/common.sh @@ -18,7 +18,7 @@ read_yn() { # diskusage : prints size in MB diskusage() { local path="$1" - read size dummy < <( du -sm "$path" ) + read size dummy < <( du -sm --apparent-size "$path" ) echo "$size" } @@ -195,10 +195,17 @@ get_architecture() { # get browser plugin directories get_browser_plugin_dirs() { - if [ $(lsb_release --id --short) = Ubuntu ]; then + if dpkg-vendor --derives-from Ubuntu; then export browser_plugin_dirs="xulrunner-addons firefox iceape iceweasel mozilla midbrowser xulrunner" else export browser_plugin_dirs=mozilla fi } +get_distribution() { + if [ -n "$distribution" ]; then + target_distribution="$distribution" + else + target_distribution="unstable" + fi +}