diff options
author | Guillaume Girol <symphorien@users.noreply.github.com> | 2022-06-25 11:24:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-25 11:24:52 +0000 |
commit | 2417363ae2de5169338f3ec502d50ea9aaaa4b2e (patch) | |
tree | 215a507ce5a881a54c7435160e98c676ff4926c9 /pkgs | |
parent | a47162920b14668a710fbfd1c186f983d0477cf6 (diff) | |
parent | acf302428e6129d88e8282736a4d76792a79362e (diff) |
Merge pull request #178141 from kenranunderscore/continue-umoria-characters
umoria: fix savefile persistence (#178136); refactor and extend
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/umoria/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/games/umoria/default.nix b/pkgs/games/umoria/default.nix index 1114d47b7be56..13ec037afba78 100644 --- a/pkgs/games/umoria/default.nix +++ b/pkgs/games/umoria/default.nix @@ -8,7 +8,7 @@ }: let - savesDir = "~/.umoria/"; + savesDir = "~/.umoria"; in gcc9Stdenv.mkDerivation rec { pname = "umoria"; @@ -38,24 +38,22 @@ gcc9Stdenv.mkDerivation rec { RUNDIR=\$(mktemp -d) - cleanup() { - rm -rf \$RUNDIR - } - - trap cleanup EXIT + # Print the directory, so users have access to dumps, and let the system + # take care of cleaning up temp files. + echo "Running umoria in \$RUNDIR" cd \$RUNDIR - mkdir data - - for i in $out/data/*; do - ln -s \$i "data/\$(basename \$i)" - done + ln -sn $out/data \$RUNDIR/data mkdir -p ${savesDir} [[ ! -f ${savesDir}/scores.dat ]] && touch ${savesDir}/scores.dat ln -s ${savesDir}/scores.dat scores.dat - $out/.umoria-unwrapped + if [ \$# -eq 0 ]; then + $out/.umoria-unwrapped ${savesDir}/game.sav + else + $out/.umoria-unwrapped "\$@" + fi EOF chmod +x $out/bin/umoria @@ -74,7 +72,7 @@ gcc9Stdenv.mkDerivation rec { ''; platforms = platforms.unix; badPlatforms = [ "aarch64-darwin" ]; - maintainers = [ maintainers.aciceri ]; + maintainers = with maintainers; [ aciceri kenran ]; license = licenses.gpl3Plus; }; } |