Re: [tomcat-native] branch master updated: Support old shells.

2019-06-28 Thread Rainer Jung 

Hi Felix,

the script uses "#!/bin/sh" which on Solaris 10 is a very original style 
of Bourne Shell. Yes, it does not support that syntax. The script 
already uses backticks in other places.


For Solaris 11 /bin/sh is a symlink to ksh and "$(...)" would work.

Regards,

Rainer

Am 28.06.2019 um 10:05 schrieb Felix Schumacher:


Am 27.06.19 um 01:03 schrieb rj...@apache.org:

This is an automated email from the ASF dual-hosted git repository.

rjung pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
  new edae9b1  Support old shells.
edae9b1 is described below

commit edae9b16888c1d5e73863877ff27bf129adc2fcd
Author: Rainer Jung 
AuthorDate: Thu Jun 27 01:02:02 2019 +0200

 Support old shells.



Hi Rainer,

do you still see shells, that don't support the $(...) syntax?

Felix



---
  jnirelease.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index 0349079..8fe7fe7 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -156,7 +156,7 @@ if [ ! -d .git/refs/remotes/9.0.x ]; then
  git remote add -f 9.0.x ${TCJAVA_GITBASE}
  fi
  git remote update 9.0.x
-diffcount=$(git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | wc 
-l)
+diffcount=`git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | wc 
-l`
  
  if [ $diffcount -ne 0 ]; then

  echo "WARNING: git subtree is not up to date with"


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat-native] branch master updated: Support old shells.

2019-06-28 Thread Felix Schumacher 


Am 27.06.19 um 01:03 schrieb rj...@apache.org:
> This is an automated email from the ASF dual-hosted git repository.
>
> rjung pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
>  new edae9b1  Support old shells.
> edae9b1 is described below
>
> commit edae9b16888c1d5e73863877ff27bf129adc2fcd
> Author: Rainer Jung 
> AuthorDate: Thu Jun 27 01:02:02 2019 +0200
>
> Support old shells.


Hi Rainer,

do you still see shells, that don't support the $(...) syntax?

Felix


> ---
>  jnirelease.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/jnirelease.sh b/jnirelease.sh
> index 0349079..8fe7fe7 100755
> --- a/jnirelease.sh
> +++ b/jnirelease.sh
> @@ -156,7 +156,7 @@ if [ ! -d .git/refs/remotes/9.0.x ]; then
>  git remote add -f 9.0.x ${TCJAVA_GITBASE}
>  fi
>  git remote update 9.0.x
> -diffcount=$(git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | 
> wc -l)
> +diffcount=`git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | 
> wc -l`
>  
>  if [ $diffcount -ne 0 ]; then
>  echo "WARNING: git subtree is not up to date with"
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat-native] branch master updated: Support old shells.

2019-06-26 Thread rjung 
This is an automated email from the ASF dual-hosted git repository.

rjung pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git


The following commit(s) were added to refs/heads/master by this push:
 new edae9b1  Support old shells.
edae9b1 is described below

commit edae9b16888c1d5e73863877ff27bf129adc2fcd
Author: Rainer Jung 
AuthorDate: Thu Jun 27 01:02:02 2019 +0200

Support old shells.
---
 jnirelease.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jnirelease.sh b/jnirelease.sh
index 0349079..8fe7fe7 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -156,7 +156,7 @@ if [ ! -d .git/refs/remotes/9.0.x ]; then
 git remote add -f 9.0.x ${TCJAVA_GITBASE}
 fi
 git remote update 9.0.x
-diffcount=$(git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | wc 
-l)
+diffcount=`git diff HEAD remotes/9.0.x/master java/org/apache/tomcat/jni | wc 
-l`
 
 if [ $diffcount -ne 0 ]; then
 echo "WARNING: git subtree is not up to date with"


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org