Accepting request 263474 from home:Ledest:bashisms

Remove '-e' option of 'echo' command in install-catalog script. That option may be unsupported in some POSIX-complete shells

OBS-URL: https://build.opensuse.org/request/show/263474
OBS-URL: https://build.opensuse.org/package/show/Publishing/sgml-skel?expand=0&rev=5
This commit is contained in:
Karl Eichwalder 2014-12-01 09:52:49 +00:00 committed by Git OBS Bridge
parent eeb51cd78a
commit 3c6fcd4906
3 changed files with 25 additions and 16 deletions

View File

@ -4,14 +4,16 @@
# This program is under GPL license. See LICENSE file for details.
# Set help message
SGML_HELP_MESSAGE="Usage: `basename $0` [<option>] <action>\n\
where <option> is:\n\
\040 -d|--delegate: \t\t\t Use DELEGATE instead of CATALOG\n\
and where <action> is:\n\
\040 -a|--add <centralized> <ordinary>: \t Declare ordinary catalog in the centralized catalog\n\
\040 -r|--remove <centralized> <ordinary>:\t Remove ordinary catalog from the centralized catalog\n\
\040 -h, --help: \t\t\t\t Print this help message and exit\n\
\040 -v, --version: \t\t\t Print the version number and exit\n"
SGML_HELP_MESSAGE="\
Usage: `basename $0` [<option>] <action>
where <option> is:
-d|--delegate: Use DELEGATE instead of CATALOG
and where <action> is:
-a|--add <centralized> <ordinary>: Declare ordinary catalog in the centralized catalog
-r|--remove <centralized> <ordinary>: Remove ordinary catalog from the centralized catalog
-h, --help: Print this help message and exit
-v, --version: Print the version number and exit
"
# Set version message
SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)"
@ -48,16 +50,16 @@ case $1 in
SGML_CENTRALIZED=$2
SGML_ORDINARY=$3
;;
-h|--help) echo -e $SGML_HELP_MESSAGE
-h|--help) echo $SGML_HELP_MESSAGE
exit 0
;;
-v|--version) echo -e $SGML_VERSION_MESSAGE
-v|--version) echo $SGML_VERSION_MESSAGE
exit 0
;;
--install) echo "install-catalog: Old syntax; doing nothing"
exit 0
;;
*) echo -e $SGML_HELP_MESSAGE >&2
*) echo $SGML_HELP_MESSAGE >&2
exit 1
;;
esac
@ -88,7 +90,7 @@ esac
# Check that the centralized catalog can be created, changed and deleted
if [ -z "$SGML_CENTRALIZED" ]
then
echo -e $SGML_HELP_MESSAGE >&2
echo $SGML_HELP_MESSAGE >&2
exit 1
fi
case $SGML_ACTION in
@ -111,7 +113,7 @@ esac
# Check that we have at least one ordinary package to process
if [ -z "$SGML_ORDINARY" ]
then
echo -e $SGML_HELP_MESSAGE >&2
echo $SGML_HELP_MESSAGE >&2
exit 1
fi
case $SGML_ACTION in

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 30 01:21:00 UTC 2014 - Led <ledest@gmail.com>
- remove '-e' option of 'echo' command in install-catalog script.
That option may be unsupported in some POSIX-complete shells
-------------------------------------------------------------------
Thu Dec 1 16:49:07 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package sgml-skel
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,18 +15,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: sgml-skel
BuildRequires: automake
BuildRequires: libxml2
Summary: Helper Scripts for the SGML System
License: GPL-2.0+
Group: Productivity/Publishing/SGML
Version: 0.6
Release: 0
Group: Productivity/Publishing/SGML
Requires: libxml2
PreReq: /bin/awk
PreReq: /bin/mv
PreReq: /bin/chmod
License: GPL-2.0+
# URL:
Source0: http://www.suse.de/~ke/%{name}/%{name}-%{version}.tar.bz2
# :pserver:anoncvs@sources.redhat.com:/cvs/docbook-tools