Author: barryh-guest
Date: 2006-03-30 01:54:10 +0000 (Thu, 30 Mar 2006)
New Revision: 2030
Modified:
trunk/java-package/lib/j2se.sh
Log:
Minor formatting cleanup of code.
Modified: trunk/java-package/lib/j2se.sh
===================================================================
--- trunk/java-package/lib/j2se.sh 2006-03-29 18:58:29 UTC (rev 2029)
+++ trunk/java-package/lib/j2se.sh 2006-03-30 01:54:10 UTC (rev 2030)
@@ -46,22 +46,22 @@
----------------------------------------------------------------------
EOF
(
- cd "$install_dir"
- find * -type f -iname copyright |
- while read file; do
- cat << EOF
+ cd "$install_dir"
+ find * -type f -iname copyright |
+ while read file; do
+ cat << EOF
File: /$file
----------------------------------------------------------------------
EOF
- cat "$file"
- cat << EOF
+ cat "$file"
+ cat << EOF
----------------------------------------------------------------------
EOF
- done
+ done
)
}
@@ -73,36 +73,40 @@
if [ "\$1" = configure ]; then
EOF
- cat "$lib_dir/$j2se_package/install" >> "$debian_dir/postinst"
+ cat "$lib_dir/install-common" >> "$debian_dir/postinst"
- cat >> "$debian_dir/postinst" << EOF
+ cat "$lib_dir/$j2se_package/install" >> "$debian_dir/postinst"
+
+ cat >> "$debian_dir/postinst" << EOF
fi
#DEBHELPER#
exit 0
EOF
- chmod 755 "$debian_dir/postinst"
+ chmod 755 "$debian_dir/postinst"
- cat > "$debian_dir/prerm" << EOF
+ cat > "$debian_dir/prerm" << EOF
#!/bin/bash
set -e
case "\$1" in
- remove | deconfigure)
+ remove | deconfigure)
EOF
- cat "$lib_dir/$j2se_package/remove" >> "$debian_dir/prerm"
+ cat "$lib_dir/remove-common" >> "$debian_dir/postinst"
- cat >> "$debian_dir/prerm" << EOF
- ;;
+ cat "$lib_dir/$j2se_package/remove" >> "$debian_dir/prerm"
+
+ cat >> "$debian_dir/prerm" << EOF
+ ;;
esac
#DEBHELPER#
exit 0
EOF
- chmod 755 "$debian_dir/prerm"
+ chmod 755 "$debian_dir/prerm"
}
function j2se_info() {
@@ -146,11 +150,11 @@
echo " dh_shlibdeps"
ldpath=
for dir in $( find "$install_dir" -type f -name "*.so*" -printf "%h\n" |
sort -u ); do
- if [[ -z "$ldpath" ]]; then
- ldpath="$dir"
- else
- ldpath="$ldpath:$dir"
- fi
+ if [[ -z "$ldpath" ]]; then
+ ldpath="$dir"
+ else
+ ldpath="$ldpath:$dir"
+ fi
done
# suppress some warnings
dh_shlibdeps -l"$ldpath" 2>&1 |
@@ -165,11 +169,11 @@
echo " copy $deb_filename into directory $working_dir/"
cp "$deb_filename" "$working_dir/"
if [ -n "$genchanges" ]; then
- echo " dpkg-genchanges"
- local changes_filename="${deb_filename%.deb}.changes"
- dpkg-genchanges -b -u. > "$changes_filename"
- echo " copy $changes_filename into directory $working_dir/"
- cp "$changes_filename" "$working_dir/"
+ echo " dpkg-genchanges"
+ local changes_filename="${deb_filename%.deb}.changes"
+ dpkg-genchanges -b -u. > "$changes_filename"
+ echo " copy $changes_filename into directory $working_dir/"
+ cp "$changes_filename" "$working_dir/"
fi
cat << EOF
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
