thank you guys for helping with the cmtk package! And sorry for being slow to respond/react
Upstream also issued a patch to address bashisms, see it attached. it seems that we are still at -1.2 in the archive so I could issue -2 with this one or if you are at it already -- just go ahead with NMU and I will absorb it later into VCS (http://git.debian.org/?p=pkg-exppsy/cmtk.git) cheers On Sun, 14 Dec 2014, Adam D. Barratt wrote: > Control: reopen -1 > On Sun, 2014-12-14 at 21:48 +0000, Michael Gilbert wrote: > > cmtk (3.2.2-1.1) unstable; urgency=medium > > . > > * Non-maintainer upload. > > * Fix bashisms in shell scripts (closes: #772217). > Unfortunately the fixes are incorrect in some cases: > +- if [[ "${line}" =~ ^\} ]]; then > ++ if [ "${line}" =~ ^\} ]; then > Even bash doesn't support =~ outside of its [[ extension. > Regards, > Adam -- Yaroslav O. Halchenko, Ph.D. http://neuro.debian.net http://www.pymvpa.org http://www.fail2ban.org Research Scientist, Psychological and Brain Sciences Dept. Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
From 008f9d42626a64378f9d5565798d225556842484 Mon Sep 17 00:00:00 2001 From: torsten_at_home <torsten_at_home@42a5c34f-2066-0410-bec5-ba365beb4995> Date: Thu, 11 Dec 2014 16:47:59 +0000 Subject: [PATCH] FIX: bashisms git-svn-id: https://www.nitrc.org/svn/cmtk/trunk@5374 42a5c34f-2066-0410-bec5-ba365beb4995 --- core/scripts/cmtk_functions.sh.in | 6 ++++-- core/scripts/groupwise_reformat.in | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/scripts/cmtk_functions.sh.in b/core/scripts/cmtk_functions.sh.in index 2e1ebf7..ba7226f 100755 --- a/core/scripts/cmtk_functions.sh.in +++ b/core/scripts/cmtk_functions.sh.in @@ -1,6 +1,8 @@ #!/bin/sh ## +## Copyright 2014 Google Inc. +## ## Copyright 2007-2011, 2014 SRI International ## ## This file is part of the Computational Morphometry Toolkit. @@ -32,9 +34,9 @@ export CMTK_BINARY_DIR=${CMTK_BINARY_DIR:-@CMTK_BINARY_DIR_CONFIG@} # Check whether we have "lockfile" tool available and include proper script with locking functions if which lockfile > /dev/null; then - source ${CMTK_BINARY_DIR}/cmtk_locking_procmail.sh + . ${CMTK_BINARY_DIR}/cmtk_locking_procmail.sh else - source ${CMTK_BINARY_DIR}/cmtk_locking.sh + . ${CMTK_BINARY_DIR}/cmtk_locking.sh fi # For convenience and readability diff --git a/core/scripts/groupwise_reformat.in b/core/scripts/groupwise_reformat.in index 848d31c..803597f 100755 --- a/core/scripts/groupwise_reformat.in +++ b/core/scripts/groupwise_reformat.in @@ -1,6 +1,8 @@ -#!/bin/sh +#!/bin/bash ## +## Copyright 2014 Google Inc. +## ## Copyright 2012, 2014 SRI International ## ## Copyright 2012 Torsten Rohlfing @@ -46,7 +48,7 @@ fi # put all arguments starting with "-" into reformat options reformatOptions="" while [[ "$1" =~ ^- ]]; do - reformatOptions+="$1 " + reformatOptions+="${1} " shift done -- 2.1.3
signature.asc
Description: Digital signature
