From ed1b8fa3b2e14f180b43e6cf3a5896f16e421031 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 13 Jun 2013 14:00:21 +0100 Subject: Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and ssh-argv0. --- debian/changelog | 2 ++ debian/openssh-client.postinst | 3 ++- debian/openssh-client.postrm | 3 ++- debian/openssh-server.postinst | 3 ++- debian/openssh-server.postrm | 3 ++- debian/openssh-server.preinst | 3 ++- debian/ssh-argv0 | 3 ++- 7 files changed, 14 insertions(+), 6 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7ab444385..689f4d420 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ openssh (1:6.2p2-5) UNRELEASED; urgency=low * Document consequences of ssh-agent being setgid in ssh-agent(1); see #711623. + * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and + ssh-argv0. -- Colin Watson Sat, 08 Jun 2013 22:12:27 +0100 diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst index 85cedc406..978b04a9b 100644 --- a/debian/openssh-client.postinst +++ b/debian/openssh-client.postinst @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e action="$1" oldversion="$2" diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm index 2b29a098b..a3b610ed1 100644 --- a/debian/openssh-client.postrm +++ b/debian/openssh-client.postrm @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e #DEBHELPER# diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst index bec99f746..24d9a2c93 100644 --- a/debian/openssh-server.postinst +++ b/debian/openssh-server.postinst @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e action="$1" oldversion="$2" diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm index fdf0802c9..33191522b 100644 --- a/debian/openssh-server.postrm +++ b/debian/openssh-server.postrm @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e #DEBHELPER# diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst index 559693f7b..9fb5d350e 100644 --- a/debian/openssh-server.preinst +++ b/debian/openssh-server.preinst @@ -1,4 +1,5 @@ -#!/bin/sh -e +#!/bin/sh +set -e action=$1 version=$2 diff --git a/debian/ssh-argv0 b/debian/ssh-argv0 index 67599aec2..37506a4d7 100644 --- a/debian/ssh-argv0 +++ b/debian/ssh-argv0 @@ -1,4 +1,5 @@ -#! /bin/sh -e +#! /bin/sh +set -e # Copyright (c) 2001 Jonathan Amery. # -- cgit v1.2.3