Fixup cardos-info scripts

1. They are not binaries.
2. No need for resources.
3. Put in separate files.

Anyway, do we actually need these? why not just document
that cardos-tool should be used instead?



git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3574 c6295689-39f2-0310-b995-f0e70906c6a9

src/tools/Makefile.am

@@ -7,10 +7,14 @@ EXTRA_DIST = Makefile.mak
 
 noinst_HEADERS = util.h
 bin_PROGRAMS = opensc-tool opensc-explorer pkcs15-tool pkcs15-crypt \
- 	pkcs11-tool cardos-tool eidenv rutoken-tool cardos-info
+ 	pkcs11-tool cardos-tool eidenv rutoken-tool
 if ENABLE_OPENSSL
 bin_PROGRAMS += cryptoflex-tool pkcs15-init netkey-tool piv-tool 
 endif
+dist_bin_SCRIPTS = cardos-info
+if WIN32
+dist_bin_SCRIPTS += cardos-info.bat
+endif
 
 AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS)
 INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include
@@ -34,7 +38,6 @@ cryptoflex_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
 pkcs15_init_SOURCES = pkcs15-init.c util.c
 pkcs15_init_LDADD = $(OPTIONAL_OPENSSL_LIBS) \
 	$(top_builddir)/src/pkcs15init/libpkcs15init.la
-cardos_info_SOURCES = 
 cardos_tool_SOURCES = cardos-tool.c util.c
 eidenv_SOURCES = eidenv.c
 netkey_tool_SOURCES = netkey-tool.c
@@ -62,14 +65,3 @@ endif
 versioninfo.rc:
 	sed 's/@@FILE_DESCRIPTION@@/OpenSC Utility/g' \
 		"$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc
-
-if WIN32
-cardos-info.bat:
-	echo "@echo off" > cardos-info.bat
-	echo "echo running cardos-tool --info" >> cardos-info.bat
-	echo "cardos-tool --info >> cardos-info.bat
-else
-cardos-info:
-	printf '#!/bin/sh\necho "running cardos-tool --info $*"\nexec cardos-tool --info $*\n' > cardos-info
-	chmod +x cardos-info
-endif

src/tools/cardos-info

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "Running cardos-tool --info $*"
+exec "$(dirname $0)"/cardos-tool --info $*

src/tools/cardos-info.bat

@@ -0,0 +1,4 @@
+@echo off
+
+echo Running cardos-tool --info %1 %2 %3 %4 %5
+%0\..\cardos-tool --info %1 %2 %3 %4 %5