giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use correct naming scheme for launch agents

This commit is contained in:
Frank Morgner 2020-11-04 17:38:30 +01:00
parent 4d6ed77a4a
commit e05574d942
7 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MacOSX/build-package.in
View File

@ -144,8 +144,8 @@ cp MacOSX/opensc-uninstall ${BUILDPATH}/target/usr/local/bin
# Prepare startup root
mkdir -p ${BUILDPATH}/target_startup/Library/LaunchAgents
cp src/tools/pkcs11-register.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
cp src/tools/opensc-notify.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
cp src/tools/org.opensc-project.mac.pkcs11-register.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
cp src/tools/org.opensc-project.mac.opensc-notify.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
# Build OpenSCToken if possible
if test -e OpenSCToken -a -n "${CODE_SIGN_IDENTITY}" -a -n "${DEVELOPMENT_TEAM}"; then

4
MacOSX/scripts/postinstall
View File

@ -53,8 +53,8 @@ done
# register the launch agents
for f in \
/Library/LaunchAgents/pkcs11-register.plist \
/Library/LaunchAgents/opensc-notify.plist
/Library/LaunchAgents/org.opensc-project.mac.pkcs11-register.plist \
/Library/LaunchAgents/org.opensc-project.mac.opensc-notify.plist
do
[ -e "$f" ] || continue
/bin/launchctl asuser "$(id -u "$USER")" /bin/launchctl load "$f" || true

4
src/tools/Makefile.am
View File

@ -21,7 +21,7 @@ do_subst = $(SED) \
-e 's,[@]X509DIR[@],$(X509DIR),g'
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-tools.rc $(srcdir)/versioninfo-opensc-notify.rc
EXTRA_DIST = Makefile.mak versioninfo-tools.rc.in versioninfo-opensc-notify.rc.in goid-tool.ggo.in npa-tool.ggo.in opensc-notify.ggo.in egk-tool.ggo.in opensc-asn1.ggo.in org.opensc.notify.desktop.in exe.manifest pkcs11-register.desktop.in pkcs11-register.plist.in opensc-notify.plist.in
EXTRA_DIST = Makefile.mak versioninfo-tools.rc.in versioninfo-opensc-notify.rc.in goid-tool.ggo.in npa-tool.ggo.in opensc-notify.ggo.in egk-tool.ggo.in opensc-asn1.ggo.in org.opensc.notify.desktop.in exe.manifest pkcs11-register.desktop.in org.opensc-project.mac.pkcs11-register.plist.in org.opensc-project.mac.opensc-notify.plist.in
noinst_HEADERS = util.h fread_to_eof.h \
egk-tool-cmdline.h goid-tool-cmdline.h npa-tool-cmdline.h \
@ -175,7 +175,7 @@ endif
%.desktop: %.desktop.in
$(do_subst) < $< > $@
noinst_DATA = pkcs11-register.plist opensc-notify.plist
noinst_DATA = org.opensc-project.mac.pkcs11-register.plist org.opensc-project.mac.opensc-notify.plist
%.plist: %.plist.in
$(do_subst) < $< > $@

14
src/tools/opensc-notify.plist.in
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>opensc-notify</string>
<key>ProgramArguments</key>
<array>
<string>@bindir@/opensc-notify</string>
</array>
<key>RunAtLoad</key>
<true/>
</dict>
</plist>

16
src/tools/org.opensc-project.mac.opensc-notify.plist.in Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>org.opensc-project.mac.opensc-notify</string>
<key>Program</key>
<string>@bindir@/opensc-notify</string>
<key>RunAtLoad</key>
<true/>
<key>StandardErrorPath</key>
<string>/dev/null</string>
<key>StandardOutPath</key>
<string>/dev/null</string>
</dict>
</plist>

16
src/tools/org.opensc-project.mac.pkcs11-register.plist.in Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>org.opensc-project.mac.pkcs11-register</string>
<key>Program</key>
<string>@bindir@/pkcs11-register</string>
<key>RunAtLoad</key>
<true/>
<key>StandardErrorPath</key>
<string>/dev/null</string>
<key>StandardOutPath</key>
<string>/dev/null</string>
</dict>
</plist>

14
src/tools/pkcs11-register.plist.in
View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Label</key>
<string>pkcs11-register</string>
<key>ProgramArguments</key>
<array>
<string>@bindir@/pkcs11-register</string>
</array>
<key>RunAtLoad</key>
<true/>
</dict>
</plist>