Re: [Freecol-developers] patch: fix looking for jar in FHS location
Okay, I put the fix back in. Thanks again Michael for your contribution. - Caleb -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
On Tue, 20 Sep 2016 23:25:27 -0500 Caleb Williams wrote: > I agree from a practical standpoint 100%. If we can share the credit > I'm all for that from a principle standpoint. > > If SF can't make it work, then we have no choice but to commit the > change ourselves. No, don't worry guys, its not that important :-) Just wanted to mention it for the next time. Michael -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
I agree from a practical standpoint 100%. If we can share the credit I'm all for that from a principle standpoint. If SF can't make it work, then we have no choice but to commit the change ourselves. Caleb On Sep 20, 2016 10:55 PM, "Michael T. Pope" wrote: > On Tue, 20 Sep 2016 21:43:07 -0500 > Caleb Williams wrote: > > Can you give it a shot Mike? > > Michael Vetter has a point about the information being richer, and > somewhat politer, but cycling the repo for a one character fix is > disproportionate. > > Cheers, > Mike Pope > > > -- > > ___ > Freecol-developers mailing list > Freecol-developers@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/freecol-developers > > -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
On Tue, 20 Sep 2016 21:43:07 -0500 Caleb Williams wrote: > Can you give it a shot Mike? Michael Vetter has a point about the information being richer, and somewhat politer, but cycling the repo for a one character fix is disproportionate. Cheers, Mike Pope pgpccm3F_txf6.pgp Description: OpenPGP digital signature -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
On Tue, Sep 20, 2016 at 9:34 PM, Caleb Williams wrote:
> > Oh but you made a small mistake.
> > If you would have used: git apply
> > 0001-Fix-testing-of-jar-in-FHS-location.patch
>
> > Thenn all the author information would have been used. Like this it was
> > written like its your patch. Some people could either take this the
> > wrong way (unfair) or generally it helps with git blame if you have
> > this info :-)
>
> Mike,
>
> Can we revert your commit and re-apply with git apply? Does SourceForge
> support this feature?
>
> I'll give it a try at least.
>
> Thanks,
>
> Caleb
>
Gave it a shot and got an error message as follows:
Caleb@caleb-laptop ~/Desktop/FreeCol Repository/freecol (master)
$ git apply 0001-Fix-testing-of-jar-in-FHS-location.patch
0001-Fix-testing-of-jar-in-FHS-location.patch:21: trailing whitespace.
elif test -r "/usr/share/java/${FREECOLJAR}" ; then
warning: packaging/common/freecol.sh has type 100644, expected 100755
error: patch failed: packaging/common/freecol.sh:66
error: packaging/common/freecol.sh: patch does not apply
Can you give it a shot Mike?
Thanks,
- Caleb
>
--
___
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
> Oh but you made a small mistake. > If you would have used: git apply > 0001-Fix-testing-of-jar-in-FHS-location.patch > Thenn all the author information would have been used. Like this it was > written like its your patch. Some people could either take this the > wrong way (unfair) or generally it helps with git blame if you have > this info :-) Mike, Can we revert your commit and re-apply with git apply? Does SourceForge support this feature? I'll give it a try at least. Thanks, Caleb -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
On Tue, 20 Sep 2016 19:45:51 +0930 "Michael T. Pope" wrote: > On Tue, 20 Sep 2016 11:37:19 +0200 > Michael Vetter wrote: > > I think I spotted a small mistake in the freecol.sh script. > > You use test -d there which is used to look for a directory. > > Actually we want to look for a jar file in that directory, so we > > should use test -r. > > Good catch. Applied. :-) Oh but you made a small mistake. If you would have used: git apply 0001-Fix-testing-of-jar-in-FHS-location.patch Thenn all the author information would have been used. Like this it was written like its your patch. Some people could either take this the wrong way (unfair) or generally it helps with git blame if you have this info :-) -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
Re: [Freecol-developers] patch: fix looking for jar in FHS location
On Tue, 20 Sep 2016 11:37:19 +0200 Michael Vetter wrote: > I think I spotted a small mistake in the freecol.sh script. > You use test -d there which is used to look for a directory. Actually > we want to look for a jar file in that directory, so we should use test > -r. Good catch. Applied. commit d74dff90cb357ceeec3326dc2910d8eb6a5fe95a Author: Mike Pope Date: Tue Sep 20 19:43:54 2016 +0930 Fix for jar finding in freecol.sh, from Michael Vetter. Cheers, Mike Pope pgpuyqD1EFCE9.pgp Description: OpenPGP digital signature -- ___ Freecol-developers mailing list Freecol-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freecol-developers
[Freecol-developers] patch: fix looking for jar in FHS location
Hello guys,
I think I spotted a small mistake in the freecol.sh script.
You use test -d there which is used to look for a directory. Actually
we want to look for a jar file in that directory, so we should use test
-r.
Let me know what you think.
Patch is attached to this mail.
jubalh>From 7f20b91cc4f2875553e0d7cdf905736513a12c61 Mon Sep 17 00:00:00 2001
From: Michael Vetter
Date: Tue, 20 Sep 2016 11:33:40 +0200
Subject: [PATCH] Fix testing of jar in FHS location
Since we look for a jar `test -d` is wrong and we should look for a
readable jar file.
---
packaging/common/freecol.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packaging/common/freecol.sh b/packaging/common/freecol.sh
index 35d80d8..2a4d57d 100755
--- a/packaging/common/freecol.sh
+++ b/packaging/common/freecol.sh
@@ -66,7 +66,7 @@ elif test -r "${FREECOLJAR}" ; then
elif test -r "${BINDIR}/${FREECOLJAR}" ; then
FCJAR="${BINDIR}/${FREECOLJAR}"
# - Is it in a likely linux FHS place?
-elif test -d "/usr/share/java/${FREECOLJAR}" ; then
+elif test -r "/usr/share/java/${FREECOLJAR}" ; then
FCJAR="/usr/share/java/${FREECOLJAR}"
# Give up.
else
--
2.10.0
--
___
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers
