Add Java 10 Server JRE support now that it's released.

[sven/java-package.git] / lib / common.sh

diff --git a/lib/common.sh b/lib/common.sh
index ec105313bd8c662b44b30827830b64b0b5c20828..ab07236aa54b5c82933d2c350a1506a14bb383ef 100644 (file)
--- 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"
 }
 
@@ -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
@@ -195,10 +204,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
+}