Page MenuHomeFreeBSD
Differential D15310 Diff 42285 games/barony/files/barony.sh.in

Changeset View

Standalone View

View Options

games/barony/files/barony.sh.in

  • This file was moved from games/barony/files/barony.sh.
Context not available.
mkdir -p ~/.barony mkdir -p ~/.barony
cd ~/.barony || { echo "Can't cd into ~/.barony" >&2; exit 1; } cd ~/.barony || { echo "Can't cd into ~/.barony" >&2; exit 1; }
exec %%PREFIX%%/bin/barony-bin $@ exec %%PREFIX%%/libexec/barony "$@"
Context not available.
AMDmi3Unsubmitted
Not Done
Inline Actions

"$@" should always be quoted.

AMDmi3: "$@" should always be quoted.
jbeichUnsubmitted
Not Done
Inline Actions

Consider patching code to use ~/.barony in order to simplify the port e.g.,

--- src/game.cpp.orig	2018-04-17 02:51:23 UTC
+++ src/game.cpp
@@ -2158,6 +2158,8 @@ bool frameRateLimit( Uint32 maxFrameRate )
 
 -------------------------------------------------------------------------------*/
 
+#include <sys/stat.h>
+#include <err.h>
 #include <stdio.h>
 //#include <unistd.h>
 #include <stdlib.h>
@@ -2167,6 +2169,14 @@ bool frameRateLimit( Uint32 maxFrameRate )
 
 int main(int argc, char** argv)
 {
+
+	//System-wide install is read-only, so save under ~/
+	if (chdir(getenv("HOME")) != 0)
+		err(1, "cannot cd to $HOME");
+	if (mkdir(".barony", 0755) != 0 && errno != EEXIST)
+		err(1, "cannot mkdir $HOME/.barony");
+	if (chdir(".barony") != 0)
+		err(1, "cannot cd to $HOME/.barony");
 
 #ifdef LINUX
 	//Catch segfault stuff.
jbeich: Consider [patching code](https://wiki.freebsd.org/DmitryMarakasov/Games#creating_.2BAH4-.2F.
tobikUnsubmitted
Not Done
Inline Actions

What about @jbeich's suggestion? It was ignored without comment.

tobik: What about @jbeich's suggestion? It was ignored without comment.
devnexen_gmail.comAuthorUnsubmitted
Not Done
Inline Actions

I got similar feedback from OpenBSD, thus there is an ongoing PR about this and will be added for the next GOG release version. So this shell script is just temporary but if you insist I ll apply the changes once I get back to my FreeBSD box.

devnexen_gmail.com: I got similar feedback from OpenBSD, thus there is an ongoing PR about this and will be added…
tobikUnsubmitted
Not Done
Inline Actions

I'm not insisting. Your explanation makes sense. I was just wondering why you haven't done it :).

Maybe add a link to the PR to the wrapper script or Makefile so that we know it's supposed to be a temporary solution.

tobik: I'm not insisting. Your explanation makes sense. I was just wondering why you haven't done it…