summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-04-19 09:28:45 +0000
committernia <nia@pkgsrc.org>2019-04-19 09:28:45 +0000
commit825d82f4347f5203b80736a235769c647152c237 (patch)
treebdf6988f307b6b3830a26ae793f7cf470e106dde
parent561dddd16e43a6ebe28eb9db1a47ec913ed6718f (diff)
downloadpkgsrc-825d82f4347f5203b80736a235769c647152c237.tar.gz
powder-toy: harden the initialization script, avoiding sh -e and quoting
more. advice from kre, thanks.
-rw-r--r--games/powder-toy/Makefile3
-rw-r--r--games/powder-toy/files/powder-toy.sh.in12
2 files changed, 7 insertions, 8 deletions
diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
index 6d5ae1ec42c..1da72363fe4 100644
--- a/games/powder-toy/Makefile
+++ b/games/powder-toy/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2019/04/13 12:08:04 nia Exp $
+# $NetBSD: Makefile,v 1.2 2019/04/19 09:28:45 nia Exp $
DISTNAME= powder-toy-94.1
+PKGREVISION= 1
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=ThePowderToy/}
GITHUB_PROJECT= The-Powder-Toy
diff --git a/games/powder-toy/files/powder-toy.sh.in b/games/powder-toy/files/powder-toy.sh.in
index dfc81444c99..0cb36f28029 100644
--- a/games/powder-toy/files/powder-toy.sh.in
+++ b/games/powder-toy/files/powder-toy.sh.in
@@ -1,9 +1,7 @@
-#!/bin/sh -e
-if [ ${XDG_DATA_HOME} ]; then
- mkdir -p ${XDG_DATA_HOME}/powder-toy
- cd ${XDG_DATA_HOME}/powder-toy
+#!/bin/sh
+if [ -n "${XDG_DATA_HOME}" ]; then
+ DIR=${XDG_DATA_HOME}/powder-toy
else
- mkdir -p ${HOME}/.local/share/powder-toy
- cd ${HOME}/.local/share/powder-toy
+ DIR=${HOME}/.local/share/powder-toy
fi
-exec @PREFIX@/libexec/powder-toy "$@"
+mkdir -p "${DIR}" && cd "${DIR}" && exec "@PREFIX@/libexec/powder-toy" "$@"