[jruby] 03/03: Deploy jruby bash script instead of bourne shell one

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch experimental
in repository jruby.

commit 8dbc8d0390e47fc88eda7461baebe06106f36e32
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu May 28 20:12:28 2015 -0300

    Deploy jruby bash script instead of bourne shell one
---
 debian/changelog                                   |  2 +-
 debian/patches/0002-Fix-warning-jruby-script.patch | 31 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  2 +-
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99d35d1..7a17bbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,7 +47,7 @@ jruby (1.7.19-1) UNRELEASED; urgency=medium
     minified copy. This is to avoid lintian warnings, during build time
     a link symbolic to libjs-jquery is deployed.
 
- -- Miguel Landaeta <nomadium at debian.org>  Thu, 28 May 2015 19:24:22 -0300
+ -- Miguel Landaeta <nomadium at debian.org>  Thu, 28 May 2015 20:11:15 -0300
 
 jruby (1.5.6-10) unstable; urgency=medium
 
diff --git a/debian/patches/0002-Fix-warning-jruby-script.patch b/debian/patches/0002-Fix-warning-jruby-script.patch
deleted file mode 100644
index fdf1e9f..0000000
--- a/debian/patches/0002-Fix-warning-jruby-script.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Miguel Landaeta <nomadium at debian.org>
-Date: Sun, 24 May 2015 23:54:04 -0300
-Subject: Fix some warnings/errors with jruby shell script
-Forwarded: no
-
-diff --git a/bin/jruby.sh b/bin/jruby.sh
-index f182b75..686f185 100755
---- a/bin/jruby.sh
-+++ b/bin/jruby.sh
-@@ -116,10 +116,10 @@ if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
- else
-     # add other jars in lib to CP for command-line execution
-     for j in "$JRUBY_HOME"/lib/*.jar; do
--        if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
-+        if [ "$j" = "$JRUBY_HOME"/lib/jruby.jar ]; then
-           continue
-         fi
--        if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
-+        if [ "$j" = "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
-           continue
-         fi
-         if [ "$CP" ]; then
-@@ -246,7 +246,7 @@ do
- done
- 
- # Force file.encoding to UTF-8 when on Mac, since Apple JDK defaults to MacRoman (JRUBY-3576)
--if [[ -z "$JAVA_ENCODING" ]]; then
-+if [ -z "$JAVA_ENCODING" ]; then
-   java_args="${java_args} -Dfile.encoding=UTF-8"
- fi
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6ad5744..7a8656e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Fix-shebang-lines.patch
-0002-Fix-warning-jruby-script.patch
 0003-Add-usr-lib-ruby-vendor-ruby-to-load-path.patch
 0006-Allow-rdoc-to-run-without-gems.patch
diff --git a/debian/rules b/debian/rules
index c6ff143..02a0436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_auto_install:
 	mkdir -p target/package
 	tar zxf ./maven/jruby-dist/target/jruby-dist-$(DEB_VERSION_UPSTREAM)-bin.tar.gz \
 	  -C target/package --strip-components=1
-	cd target/package/bin && mv jruby.sh jruby
+	cd target/package/bin && mv jruby.bash jruby
 	cd target/package/bin && chmod 0755 *
 	rm target/package/lib/ruby/2.0/rdoc/generator/template/darkfish/js/jquery.js
 	mkdir -p target/package/lib/ruby/gems/shared/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git