X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fcommon.sh;h=ab07236aa54b5c82933d2c350a1506a14bb383ef;hp=a9ed23104284fc283c53f32495ae7aa104c08ade;hb=HEAD;hpb=9be7aa4fcd4a0153bf128d1a6ea0721835db490b

diff --git a/lib/common.sh b/lib/common.sh
index a9ed231..ab07236 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -18,7 +18,7 @@ read_yn() {
 # diskusage <path>: prints size in MB
 diskusage() {
     local path="$1"
-    read size dummy < <( du -sm "$path" )
+    read size dummy < <( du -sm --apparent-size "$path" )
     echo "$size"
 }
 
@@ -69,7 +69,7 @@ EOF
     mkdir "$extract_dir"
     cd "$extract_dir"
     echo
-    
+
     local extract_cmd
     case "$archive_path" in
     *.tar)
@@ -83,7 +83,7 @@ EOF
     *)
         extract_cmd=sh
     esac
-    
+
     if ! $extract_cmd "$archive_path"; then
     cat << EOF
 
@@ -128,6 +128,15 @@ EOF
     fi
 }
 
+extract_jce() {
+  local zip_file="$1"
+  local dest_dir="$2"
+
+  echo "Installing unlimited strength cryptography files using $zip_file"
+  for f in {US_export,local}_policy.jar; do
+    unzip -o -j -d "$dest_dir" "$zip_file" "*/$f"
+  done
+}
 
 read_maintainer_info() {
     if [ -z "$maintainer_name" ]; then
@@ -137,7 +146,7 @@ read_maintainer_info() {
         maintainer_name="$DEBNAME"
     else
         default_name="$(getent passwd $(id -run) | cut -d: -f5| cut -d, -f1)"
-    
+
     cat << EOF
 
 Please enter your full name. This value will be used in the maintainer
@@ -154,12 +163,12 @@ EOF
     done
     fi
     fi
-    
+
     if [ -z "$maintainer_email" ]; then
     local default_email=
     if [ -n "$DEBEMAIL" ]; then
         maintainer_email="$DEBEMAIL"
-    else 
+    else
     if [ -r "/etc/mailname" ]; then
         default_email="$( id -run )@$( cat /etc/mailname )"
     else
@@ -187,18 +196,25 @@ get_architecture() {
     export DEB_BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
 
     export DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-    
+
     echo "Detected Debian build architecture: ${DEB_BUILD_ARCH:-N/A}"
-    
+
     echo "Detected Debian GNU type: ${DEB_BUILD_GNU_TYPE:-N/A}"
 }
 
 # 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
+}