From 33cb7ed48259fc7e22823531fc41a4a430aecc1b Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Sun, 6 Jan 2008 13:02:48 +0000 Subject: [PATCH] Use shell /usr/bin/tclsh for Tcl scripts. Use shell /usr/bin/tclsh for Tcl scripts. Do not use the smart exec invokation trick. It causes more confusion . Systems such as Debian has /usr/bin/tclsh as the preferred Tcl shell anyway. --- src/charconv.tcl | 7 ++----- src/csvtobib1.tcl | 8 +++----- src/csvtosru_update.tcl | 8 +++----- src/csvtosrw.tcl | 8 +++----- util/yaz-asncomp | 6 ++---- 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/src/charconv.tcl b/src/charconv.tcl index b37b0d8..5732f8d 100755 --- a/src/charconv.tcl +++ b/src/charconv.tcl @@ -1,8 +1,5 @@ -#!/bin/sh -# the next line restarts using tclsh \ -if [ -f /usr/local/bin/tclsh8.4 ]; then exec tclsh8.4 "$0" "$@"; else exec tclsh "$0" "$@"; fi -# -# $Id: charconv.tcl,v 1.20 2007-09-22 18:55:02 adam Exp $ +#!/usr/bin/tclsh +# $Id: charconv.tcl,v 1.21 2008-01-06 13:02:48 adam Exp $ proc usage {} { puts {charconv.tcl: [-p prefix] [-s split] [-o ofile] file ... } diff --git a/src/csvtobib1.tcl b/src/csvtobib1.tcl index 8065bbb..2ed437b 100755 --- a/src/csvtobib1.tcl +++ b/src/csvtobib1.tcl @@ -1,17 +1,15 @@ -#!/bin/sh -# the next line restats using tclsh \ -exec tclsh "$0" "$@" +#!/usr/bin/tclsh # # This file is part of the YAZ toolkit # Copyright (c) Index Data 1996-2007 # See the file LICENSE for details. # -# $Id: csvtobib1.tcl,v 1.4 2007-01-03 08:42:15 adam Exp $ +# $Id: csvtobib1.tcl,v 1.5 2008-01-06 13:02:48 adam Exp $ # # Converts a CSV file with Bib-1 diagnostics to C+H file for easy # maintenance # -# $Id: csvtobib1.tcl,v 1.4 2007-01-03 08:42:15 adam Exp $ +# $Id: csvtobib1.tcl,v 1.5 2008-01-06 13:02:48 adam Exp $ source [lindex $argv 0]/csvtodiag.tcl diff --git a/src/csvtosru_update.tcl b/src/csvtosru_update.tcl index fa9ccdd..156744c 100644 --- a/src/csvtosru_update.tcl +++ b/src/csvtosru_update.tcl @@ -1,17 +1,15 @@ -#!/bin/sh -# the next line restats using tclsh \ -exec tclsh "$0" "$@" +#!/usr/bin/tclsh # # This file is part of the YAZ toolkit # Copyright (c) Index Data 1996-2007 # See the file LICENSE for details. # -# $Id: csvtosru_update.tcl,v 1.2 2007-01-03 08:42:15 adam Exp $ +# $Id: csvtosru_update.tcl,v 1.3 2008-01-06 13:02:48 adam Exp $ # # Converts a CSV file with SRU update diagnostics to C+H file for easy # maintenance # -# $Id: csvtosru_update.tcl,v 1.2 2007-01-03 08:42:15 adam Exp $ +# $Id: csvtosru_update.tcl,v 1.3 2008-01-06 13:02:48 adam Exp $ source [lindex $argv 0]/csvtodiag.tcl diff --git a/src/csvtosrw.tcl b/src/csvtosrw.tcl index 71e4558..8a1dc4b 100755 --- a/src/csvtosrw.tcl +++ b/src/csvtosrw.tcl @@ -1,17 +1,15 @@ -#!/bin/sh -# the next line restats using tclsh \ -exec tclsh "$0" "$@" +#!/usr/bin/tclsh # # This file is part of the YAZ toolkit # Copyright (c) Index Data 1996-2007 # See the file LICENSE for details. # -# $Id: csvtosrw.tcl,v 1.4 2007-01-03 08:42:15 adam Exp $ +# $Id: csvtosrw.tcl,v 1.5 2008-01-06 13:02:48 adam Exp $ # # Converts a CSV file with SRW diagnostics to C+H file for easy # maintenance # -# $Id: csvtosrw.tcl,v 1.4 2007-01-03 08:42:15 adam Exp $ +# $Id: csvtosrw.tcl,v 1.5 2008-01-06 13:02:48 adam Exp $ source [lindex $argv 0]/csvtodiag.tcl diff --git a/util/yaz-asncomp b/util/yaz-asncomp index a881daa..bbdeb04 100755 --- a/util/yaz-asncomp +++ b/util/yaz-asncomp @@ -1,12 +1,10 @@ -#!/bin/sh -# the next line restarts using tclsh \ -if [ -f /usr/local/bin/tclsh8.4 ]; then exec tclsh8.4 "$0" "$@"; else exec tclsh "$0" "$@"; fi +#!/usr/bin/tclsh # # yaz-comp: ASN.1 Compiler for YAZ # (c) Index Data 1996-2007 # See the file LICENSE for details. # -# $Id: yaz-asncomp,v 1.8 2007-01-03 08:42:16 adam Exp $ +# $Id: yaz-asncomp,v 1.9 2008-01-06 13:02:48 adam Exp $ # set yc_version 0.4 -- 1.7.10.4